From eff7ab42c0409b5df83b5b71f69d90860f228ab3 Mon Sep 17 00:00:00 2001 From: Benjamin Gaidioz Date: Wed, 21 Aug 2024 14:02:42 +0200 Subject: [PATCH 1/7] Fix us-east-1 credential test (#485) --- .../scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala b/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala index 375a9a3ce..7cfc5cf62 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala +++ b/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala @@ -98,7 +98,7 @@ object TestCredentials { val unitTestPrivateBucketUsEast1Cred = S3Config .newBuilder() .setAccessSecretKey(S3AccessSecretKey.newBuilder().setAccessKey(accessKeyId).setSecretKey(secretKeyId)) - .setRegion("eu-west-1") + .setRegion("us-east-1") .build() /////////////////////////////////////////////////////////////////////////// From fd046fd7a18ec3d362734938da01bbf23d94127e Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Thu, 22 Aug 2024 13:59:12 +0200 Subject: [PATCH 2/7] Renames package structure to com.rawlabs. (#491) --- .github/workflows/ci.yaml | 19 +- build.sbt | 70 +- .../src/main/java/module-info.java | 18 +- .../rawlabs/compiler}/CompilerService.scala | 4 +- .../compiler}/CompilerServiceBuilder.scala | 4 +- .../compiler}/CompilerServiceProvider.scala | 6 +- .../scala/com/rawlabs/compiler}/Docs.scala | 2 +- .../com/rawlabs/compiler}/Entrypoint.scala | 2 +- .../scala/com/rawlabs/compiler}/Errors.scala | 4 +- .../compiler}/ProgramDescription.scala | 2 +- .../compiler}/ProgramEnvironment.scala | 7 +- .../com/rawlabs/compiler}/RawTypes.scala | 2 +- .../com/rawlabs/compiler}/RawValues.scala | 2 +- .../compiler}/utils/RecordFieldsNaming.scala | 2 +- .../writers/PolyglotBinaryWriter.scala | 2 +- .../compiler}/writers/PolyglotCsvWriter.scala | 2 +- .../writers/PolyglotJsonWriter.scala | 2 +- .../writers/PolyglotTextWriter.scala | 2 +- .../writers/TypedPolyglotCsvWriter.scala | 25 +- .../writers/TypedPolyglotJsonWriter.scala | 26 +- launcher/src/main/java/module-info.java | 6 +- .../main/java/raw/cli/MultilineParser.java | 2 +- .../src/main/java/raw/cli/RawLauncher.java | 8 +- launcher/src/main/resources/reference.conf | 1 - project/BuildSettings.scala | 2 +- .../protocol/compiler/Placeholder.java | 17 + .../src/main/java/module-info.java | 8 +- .../rawlabs/protocol/compiler}/protocol.proto | 4 +- .../rawlabs/protocol/raw}/Placeholder.java | 2 +- .../src/main/java/module-info.java | 4 +- .../com/rawlabs/protocol/raw/types.proto | 149 ++++ .../com/rawlabs/protocol/raw/values.proto | 114 +++ .../raw.client.api.CompilerServiceBuilder | 1 - {python-client => python-compiler}/.sbtopts | 0 .../.scalafmt.conf | 0 {python-client => python-compiler}/build.sh | 0 .../project/Dependencies.scala | 0 .../project/build.properties | 0 .../project/plugins.sbt | 0 ...om.rawlabs.compiler.CompilerServiceBuilder | 1 + .../compiler}/PythonCompilerService.scala | 10 +- .../PythonCompilerServiceBuilder.scala | 7 +- .../compiler}/TestPythonCompilerService.scala | 6 +- .../raw.client.api.CompilerServiceBuilder | 1 - .../src/main/java/module-info.java | 17 +- ...om.rawlabs.compiler.CompilerServiceBuilder | 1 + .../CustomClassAndModuleLoader.scala | 2 +- .../snapi/compiler}/Rql2CompilerService.scala | 10 +- .../Rql2TruffleCompilerService.scala | 80 +- .../Rql2TruffleCompilerServiceBuilder.scala | 7 +- .../compiler/writers}/Rql2CsvWriter.scala | 34 +- .../compiler/writers}/Rql2JsonWriter.scala | 8 +- .../api/Rql2CompilerServiceTestContext.scala | 7 +- .../compiler}/api/Rql2OutputTestContext.scala | 10 +- .../compiler}/tests/FailAfterNServer.scala | 2 +- .../tests/Rql2CompilerTestContext.scala | 40 +- .../tests/benchmark/BenchmarkTests.scala | 7 +- .../tests/benchmark/StressTests.scala | 7 +- .../tests/builtin/BinaryPackageTest.scala | 9 +- .../tests/builtin/BytePackageTest.scala | 7 +- .../tests/builtin/CsvPackageTest.scala | 9 +- .../tests/builtin/DatePackageTest.scala | 7 +- .../tests/builtin/DecimalPackageTest.scala | 7 +- .../tests/builtin/DoublePackageTest.scala | 7 +- .../builtin/EnvironmentPackageTest.scala | 7 +- .../tests/builtin/ErrorPackageTest.scala | 7 +- .../tests/builtin/FloatPackageTest.scala | 7 +- .../tests/builtin/FunctionPackageTest.scala | 9 +- .../tests/builtin/HttpPackageTest.scala | 7 +- .../tests/builtin/IntPackageTest.scala | 7 +- .../tests/builtin/IntervalPackageTest.scala | 7 +- .../tests/builtin/JsonPackageTest.scala | 9 +- .../tests/builtin/LibraryPackageTest.scala | 8 - .../tests/builtin/LocationPackageTest.scala | 11 +- .../tests/builtin/LongPackageTest.scala | 7 +- .../tests/builtin/MathPackageTest.scala | 7 +- .../tests/builtin/NullablePackageTest.scala | 7 +- .../builtin/NullableTryablePackageTest.scala | 7 +- .../tests/builtin/RecordPackageTest.scala | 7 +- .../tests/builtin/RegexPackageTest.scala | 7 +- .../tests/builtin/S3PackageTest.scala | 9 +- .../tests/builtin/ShortPackageTest.scala | 7 +- .../tests/builtin/StringPackageTest.scala | 15 +- .../tests/builtin/SuccessPackageTest.scala | 9 +- .../tests/builtin/TimePackageTest.scala | 7 +- .../tests/builtin/TimestampPackageTest.scala | 7 +- .../tests/builtin/TryPackageTest.scala | 7 +- .../tests/builtin/TypePackageTest.scala | 9 +- .../tests/builtin/XmlPackageTest.scala | 9 +- .../collection/CollectionDistinctTest.scala | 9 +- .../collection/CollectionExplodeTest.scala | 11 +- .../collection/CollectionGroupByTest.scala | 13 +- .../collection/CollectionJoinTest.scala | 13 +- .../collection/CollectionMinMaxTest.scala | 9 +- .../collection/CollectionMkStringTest.scala | 7 +- .../collection/CollectionOrderByTest.scala | 13 +- .../collection/CollectionPackageTest.scala | 11 +- .../collection/CollectionRangeTest.scala | 7 +- .../collection/CollectionUnionTest.scala | 11 +- .../builtin/credentials/AwsPackageTest.scala | 7 +- .../credentials/EnvironmentPackageTest.scala | 7 +- .../credentials/LocationPackageTest.scala | 11 +- .../credentials/MySQLPackageTest.scala | 9 +- .../credentials/OraclePackageTest.scala | 9 +- .../credentials/PostgreSQLPackageTest.scala | 9 +- .../builtin/credentials/S3PackageTest.scala | 9 +- .../credentials/SQLServerPackageTest.scala | 9 +- .../credentials/SnowflakePackageTest.scala | 11 +- .../tests/builtin/list/ListDistinctTest.scala | 9 +- .../tests/builtin/list/ListExplodeTest.scala | 11 +- .../tests/builtin/list/ListGroupByTest.scala | 13 +- .../tests/builtin/list/ListJoinTest.scala | 13 +- .../tests/builtin/list/ListMinMaxTest.scala | 9 +- .../tests/builtin/list/ListMkStringTest.scala | 7 +- .../tests/builtin/list/ListOrderByTest.scala | 13 +- .../tests/builtin/list/ListPackageTest.scala | 11 +- .../tests/builtin/list/ListUnionTest.scala | 11 +- .../hints/SemanticAnalyzerHintsTest.scala | 7 +- .../tests/lsp/LspAiValidateTest.scala | 11 +- .../tests/lsp/LspBrokenCodeTest.scala | 9 +- .../tests/lsp/LspCommentsFormatTest.scala | 9 +- .../lsp/LspCompilationMessagesTest.scala | 12 +- .../tests/lsp/LspDefinitionTest.scala | 9 +- .../tests/lsp/LspDotAutoCompleteTest.scala | 9 +- .../tests/lsp/LspFormatCodeTest.scala | 9 +- .../compiler}/tests/lsp/LspHoverTest.scala | 9 +- .../compiler}/tests/lsp/LspRenameTest.scala | 9 +- .../compiler}/tests/lsp/LspValidateTest.scala | 9 +- .../tests/lsp/LspWordAutoCompleteTest.scala | 20 +- .../tests/offheap/KryoPackageTest.scala | 9 +- .../tests/offheap/OffHeapDatasets.scala | 6 +- .../tests/offheap/OffHeapDistinctTest.scala | 9 +- .../tests/offheap/OffHeapEquiJoinTest.scala | 9 +- .../tests/offheap/OffHeapGroupTest.scala | 9 +- .../tests/offheap/OffHeapJoinTest.scala | 9 +- .../tests/offheap/OffHeapOrderByTest.scala | 9 +- .../tests/output/BinaryOutputTest.scala | 9 +- .../tests/output/CsvOutputTest.scala | 12 +- .../tests/output/JsonOutputTest.scala | 10 +- .../tests/output/TextOutputTest.scala | 7 +- .../parser/FrontendSyntaxAnalyzerTest.scala | 7 +- .../tests/parser/ListSugarTest.scala | 7 +- .../tests/parser/OperatorPrecedenceTest.scala | 11 +- .../tests/parser/RecordSugarTest.scala | 7 +- .../tests/regressions/RD10194Test.scala | 7 +- .../tests/regressions/RD10220Test.scala | 7 +- .../tests/regressions/RD10723Test.scala | 7 +- .../tests/regressions/RD10767Test.scala | 8 +- .../tests/regressions/RD10801Test.scala | 9 +- .../tests/regressions/RD3742Test.scala | 7 +- .../tests/regressions/RD3784Test.scala | 9 +- .../tests/regressions/RD4529Test.scala | 7 +- .../tests/regressions/RD4981Test.scala | 11 +- .../tests/regressions/RD5238Test.scala | 11 +- .../tests/regressions/RD5365Test.scala | 13 +- .../tests/regressions/RD5393Test.scala | 9 +- .../tests/regressions/RD5412Test.scala | 7 +- .../tests/regressions/RD5448Test.scala | 9 +- .../tests/regressions/RD5484Test.scala | 9 +- .../tests/regressions/RD5488Test.scala | 9 +- .../tests/regressions/RD5491Test.scala | 7 +- .../tests/regressions/RD5644Test.scala | 7 +- .../tests/regressions/RD5679Test.scala | 9 +- .../tests/regressions/RD5685Test.scala | 7 +- .../tests/regressions/RD5691Test.scala | 9 +- .../tests/regressions/RD5697Test.scala | 9 +- .../tests/regressions/RD5714Test.scala | 7 +- .../tests/regressions/RD5722Test.scala | 7 +- .../tests/regressions/RD572Test.scala | 7 +- .../tests/regressions/RD5775Test.scala | 7 +- .../tests/regressions/RD5779Test.scala | 9 +- .../tests/regressions/RD5784Test.scala | 9 +- .../tests/regressions/RD5785Test.scala | 7 +- .../tests/regressions/RD5786Test.scala | 7 +- .../tests/regressions/RD5851Test.scala | 23 +- .../tests/regressions/RD5884Test.scala | 7 +- .../tests/regressions/RD5893Test.scala | 9 +- .../tests/regressions/RD5914Test.scala | 7 +- .../tests/regressions/RD5920Test.scala | 7 +- .../tests/regressions/RD5921Test.scala | 9 +- .../tests/regressions/RD5925Test.scala | 7 +- .../tests/regressions/RD5932Test.scala | 9 +- .../tests/regressions/RD5968Test.scala | 9 +- .../tests/regressions/RD5971Test.scala | 7 +- .../tests/regressions/RD5979Test.scala | 7 +- .../tests/regressions/RD7924Test.scala | 9 +- .../tests/regressions/RD7974Test.scala | 10 +- .../tests/regressions/RD8530Test.scala | 7 +- .../tests/regressions/RD8764Test.scala | 7 +- .../tests/regressions/RD8935Test.scala | 9 +- .../tests/regressions/RD8993Test.scala | 7 +- .../tests/regressions/RD9137Test.scala | 7 +- .../tests/regressions/RD9228Test.scala | 7 +- .../tests/regressions/RD9229Test.scala | 7 +- .../tests/regressions/RD9255Test.scala | 25 +- .../tests/regressions/RD9359Test.scala | 9 +- .../tests/regressions/RD9409Test.scala | 9 +- .../tests/regressions/RD9445Test.scala | 9 +- .../tests/regressions/RD9479Test.scala | 9 +- .../tests/regressions/RD9485Test.scala | 9 +- .../tests/regressions/RD9554Test.scala | 7 +- .../tests/regressions/RD9616Test.scala | 7 +- .../tests/regressions/RD9932Test.scala | 7 +- .../regressions/credentials/RD3084Test.scala | 9 +- .../regressions/credentials/RD4445Test.scala | 13 +- .../regressions/credentials/RD5932Test.scala | 9 +- .../tests/spec/BasicStagedCompilerTest.scala | 7 +- .../tests/spec/BinaryExpAndTest.scala | 9 +- .../tests/spec/BinaryExpDivTest.scala | 9 +- .../tests/spec/BinaryExpEqTest.scala | 9 +- .../tests/spec/BinaryExpGeTest.scala | 9 +- .../tests/spec/BinaryExpGtTest.scala | 9 +- .../tests/spec/BinaryExpLeTest.scala | 9 +- .../tests/spec/BinaryExpLtTest.scala | 9 +- .../tests/spec/BinaryExpModTest.scala | 9 +- .../tests/spec/BinaryExpMultTest.scala | 9 +- .../tests/spec/BinaryExpNeqTest.scala | 9 +- .../tests/spec/BinaryExpOrTest.scala | 9 +- .../tests/spec/BinaryExpPlusTest.scala | 9 +- .../tests/spec/BinaryExpSubTest.scala | 9 +- .../compiler}/tests/spec/ClosureTest.scala | 7 +- .../spec/CombinationSpecTestHelper.scala | 2 +- .../compiler}/tests/spec/ConstTest.scala | 11 +- .../compiler}/tests/spec/ErrorsTest.scala | 7 +- .../compiler}/tests/spec/FunAbsTest.scala | 7 +- .../compiler}/tests/spec/IfThenElseTest.scala | 9 +- .../tests/spec/ImplicitCastTest.scala | 7 +- .../tests/spec/JoinWithTryRowsTest.scala | 11 +- .../compiler}/tests/spec/LetBindTest.scala | 9 +- .../compiler}/tests/spec/LetFunRecTest.scala | 9 +- .../compiler}/tests/spec/LetFunTest.scala | 7 +- .../compiler}/tests/spec/LetTypeTest.scala | 7 +- .../compiler}/tests/spec/MigrationTest.scala | 14 +- .../tests/spec/PackageNameTest.scala | 7 +- .../snapi/compiler}/tests/spec/ProjTest.scala | 7 +- .../tests/spec/PropagationTest.scala | 7 +- .../tests/spec/StagedCompilerTest.scala | 9 +- .../tests/spec/UnaryExpNegTest.scala | 9 +- .../tests/spec/UnaryExpNotTest.scala | 9 +- ...ql2TruffleCompilerServiceTestContext.scala | 7 +- .../Rql2TruffleCompilerTestContext.scala | 4 +- snapi-frontend/src/main/java/module-info.java | 42 +- .../src/main/resources/reference.conf | 114 ++- .../snapi/frontend}/base/BaseTree.scala | 10 +- .../frontend}/base/CompilerContext.scala | 7 +- .../snapi/frontend}/base/Counter.scala | 2 +- .../snapi/frontend}/base/Keywords.scala | 2 +- .../rawlabs/snapi/frontend}/base/Phase.scala | 2 +- .../snapi/frontend}/base/PrettyPrinter.scala | 4 +- .../snapi/frontend}/base/ProgramContext.scala | 6 +- .../frontend}/base/SemanticAnalyzer.scala | 8 +- .../snapi/frontend}/base/SymbolTable.scala | 2 +- .../snapi/frontend}/base/SyntaxAnalyzer.scala | 7 +- .../rawlabs/snapi/frontend}/base/Tree.scala | 11 +- .../frontend}/base/TreeDescription.scala | 4 +- .../frontend}/base/TreeWithPositions.scala | 13 +- .../snapi/frontend}/base/errors/Errors.scala | 6 +- .../base/errors/ErrorsPrettyPrinter.scala | 8 +- .../base/source/SourcePrettyPrinter.scala | 7 +- .../frontend}/base/source/SourceTree.scala | 2 +- .../frontend/common/PhaseDescriptor.scala | 35 + .../frontend}/common/source/SourceTree.scala | 8 +- .../inferrer/api/DateTimeFormatFinder.scala | 2 +- .../inferrer/api/InferrerException.scala | 4 +- .../inferrer/api/InferrerProperties.scala | 10 +- .../inferrer/api/InferrerService.scala | 12 +- .../api/InferrerServiceProvider.scala | 8 +- .../inferrer/api/InputFormatDescriptors.scala | 4 +- .../api/SourceTypePrettyPrinter.scala | 2 +- .../frontend}/inferrer/api/SourceTypes.scala | 2 +- .../inferrer/local/EncodingInferrer.scala | 10 +- .../inferrer/local/InferrerErrorHandler.scala | 2 +- .../local/LocalInferrerException.scala | 4 +- .../inferrer/local/LocalInferrerService.scala | 34 +- .../frontend}/inferrer/local/MergeTypes.scala | 4 +- .../inferrer/local/TextTypeInferrer.scala | 4 +- .../inferrer/local/auto/AutoInferrer.scala | 24 +- .../auto/InferrerBufferedSeekableIS.scala | 4 +- .../inferrer/local/csv/CsvInferrer.scala | 20 +- .../inferrer/local/csv/CsvMergeTypes.scala | 12 +- .../inferrer/local/csv/CsvTypeSniffer.scala | 6 +- .../inferrer/local/hjson/HjsonInferrer.scala | 18 +- .../inferrer/local/jdbc/JdbcInferrer.scala | 6 +- .../local/jdbc/JdbcTypeToSourceType.scala | 12 +- .../inferrer/local/json/JsonInferrer.scala | 14 +- .../inferrer/local/json/JsonUtils.scala | 6 +- .../inferrer/local/text/TextInferrer.scala | 14 +- .../local/text/TextLineIterator.scala | 2 +- .../local/xml/InferrerXmlTypeReader.scala | 8 +- .../inferrer/local/xml/XmlInferrer.scala | 14 +- .../inferrer/local/xml/XmlMergeTypes.scala | 8 +- .../rql2/CommonSemanticAnalyzer.scala | 12 +- .../rql2/FrontendSyntaxAnalyzer.scala | 14 +- .../snapi/frontend}/rql2/ImplicitCasts.scala | 14 +- .../snapi/frontend}/rql2/Keywords.scala | 4 +- .../frontend}/rql2/ListProjDesugarer.scala | 12 +- .../snapi/frontend}/rql2/PipelinedPhase.scala | 10 +- .../snapi/frontend}/rql2/ProgramContext.scala | 12 +- .../snapi/frontend}/rql2/Propagation.scala | 16 +- .../frontend}/rql2/Rql2ProgramContext.scala | 6 +- .../snapi/frontend}/rql2/Rql2TypeUtils.scala | 38 +- .../frontend}/rql2/SemanticAnalyzer.scala | 18 +- .../snapi/frontend}/rql2/StagedCompiler.scala | 14 +- .../rql2/SugarExtensionDesugarer.scala | 18 +- .../snapi/frontend}/rql2/SymbolTable.scala | 10 +- .../snapi/frontend}/rql2/SyntaxAnalyzer.scala | 14 +- .../rawlabs/snapi/frontend}/rql2/Tree.scala | 8 +- .../frontend}/rql2/TreeWithPositions.scala | 8 +- .../rql2/antlr4/Antlr4SyntaxAnalyzer.scala | 12 +- .../antlr4/CommentsAntlrSyntaxAnalyzer.scala | 6 +- .../frontend}/rql2/antlr4/ParserErrors.scala | 2 +- .../rql2/antlr4/RawErrorListener.scala | 4 +- .../frontend}/rql2/antlr4/RawPositions.scala | 2 +- .../rql2/antlr4/RawSnapiVisitor.scala | 16 +- .../rql2/antlr4/RawVisitorParseErrors.scala | 4 +- .../rql2/api/EntryExtensionProvider.scala | 302 +++++++ .../rql2/api/LocationDescription.scala | 52 +- .../frontend}/rql2/api/PackageExtension.scala | 20 +- .../rql2/api/PackageExtensionProvider.scala | 70 ++ .../snapi/frontend}/rql2/api/Values.scala | 4 +- .../frontend}/rql2/builtin/Aggregations.scala | 12 +- .../frontend}/rql2/builtin/AwsPackage.scala | 12 +- .../rql2/builtin/BinaryPackage.scala | 10 +- .../rql2/builtin/BinaryPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/BytePackage.scala | 12 +- .../rql2/builtin/BytePackageBuilder.scala | 6 +- .../rql2/builtin/CollectionPackage.scala | 20 +- .../builtin/CollectionPackageBuilder.scala | 8 +- .../frontend}/rql2/builtin/CsvPackage.scala | 22 +- .../frontend}/rql2/builtin/DatePackage.scala | 8 +- .../rql2/builtin/DatePackageBuilder.scala | 6 +- .../rql2/builtin/DecimalPackage.scala | 12 +- .../rql2/builtin/DecimalPackageBuilder.scala | 6 +- .../rql2/builtin/DoublePackage.scala | 12 +- .../rql2/builtin/DoublePackageBuilder.scala | 6 +- .../rql2/builtin/EnvironmentPackage.scala | 22 +- .../builtin/EnvironmentPackageBuilder.scala | 8 +- .../frontend}/rql2/builtin/ErrorPackage.scala | 12 +- .../rql2/builtin/ErrorPackageBuilder.scala | 8 +- .../frontend}/rql2/builtin/FloatPackage.scala | 12 +- .../rql2/builtin/FloatPackageBuilder.scala | 6 +- .../rql2/builtin/FunctionPackage.scala | 12 +- .../frontend}/rql2/builtin/HttpPackage.scala | 12 +- .../frontend}/rql2/builtin/IntPackage.scala | 12 +- .../rql2/builtin/IntPackageBuilder.scala | 6 +- .../rql2/builtin/IntervalPackage.scala | 12 +- .../rql2/builtin/IntervalPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/JsonPackage.scala | 20 +- .../frontend}/rql2/builtin/KryoPackage.scala | 12 +- .../rql2/builtin/LibraryPackage.scala | 22 +- .../frontend}/rql2/builtin/ListPackage.scala | 20 +- .../rql2/builtin/ListPackageBuilder.scala | 8 +- .../rql2/builtin/LocationPackage.scala | 12 +- .../rql2/builtin/LocationPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/LongPackage.scala | 12 +- .../rql2/builtin/LongPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/MathPackage.scala | 16 +- .../frontend}/rql2/builtin/MySQLPackage.scala | 22 +- .../rql2/builtin/NullablePackage.scala | 23 +- .../rql2/builtin/NullablePackageBuilder.scala | 8 +- .../rql2/builtin/NullableTryablePackage.scala | 12 +- .../NullableTryablePackageBuilder.scala | 6 +- .../rql2/builtin/OraclePackage.scala | 20 +- .../rql2/builtin/PostgreSQLPackage.scala | 22 +- .../rql2/builtin/RecordPackage.scala | 18 +- .../rql2/builtin/RecordPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/RegexPackage.scala | 12 +- .../frontend}/rql2/builtin/S3Package.scala | 12 +- .../rql2/builtin/SQLServerPackage.scala | 22 +- .../frontend}/rql2/builtin/ShortPackage.scala | 12 +- .../rql2/builtin/ShortPackageBuilder.scala | 6 +- .../rql2/builtin/SnowflakePackage.scala | 22 +- .../rql2/builtin/StringPackage.scala | 16 +- .../rql2/builtin/SuccessPackage.scala | 12 +- .../rql2/builtin/SuccessPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/TestPackage.scala | 16 +- .../frontend}/rql2/builtin/TimePackage.scala | 8 +- .../rql2/builtin/TimePackageBuilder.scala | 6 +- .../rql2/builtin/TimestampPackage.scala | 16 +- .../builtin/TimestampPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/TryPackage.scala | 12 +- .../rql2/builtin/TryPackageBuilder.scala | 6 +- .../frontend}/rql2/builtin/TypePackage.scala | 16 +- .../rql2/builtin/TypePackageBuilder.scala | 8 +- .../frontend}/rql2/builtin/XmlPackage.scala | 20 +- .../snapi/frontend}/rql2/errors/Errors.scala | 6 +- .../rql2/errors/ErrorsPrettyPrinter.scala | 10 +- .../rql2/lsp/CompilerLspService.scala | 37 +- .../rql2/lsp/LspSyntaxAnalyzer.scala | 14 +- .../source/SourceCommentsPrettyPrinter.scala | 8 +- .../rql2/source/SourcePrettyPrinter.scala | 15 +- .../frontend}/rql2/source/SourceTree.scala | 6 +- .../snapi/frontend}/utils/Attribution.scala | 2 +- .../frontend}/utils/ExtraRewriters.scala | 2 +- .../snapi/frontend}/utils/package.scala | 2 +- .../raw/compiler/common/PhaseDescriptor.scala | 33 - .../rql2/api/EntryExtensionProvider.scala | 302 ------- .../rql2/api/PackageExtensionProvider.scala | 70 -- .../InferrerBufferedSeekableIsTest.scala | 6 +- .../inferrer/local/LocalInferrerTest.scala | 11 +- .../local/LocalInferrerTestContext.scala | 6 +- .../frontend}/inferrer/local/RD10260.scala | 8 +- .../frontend}/inferrer/local/RD10439.scala | 10 +- .../frontend}/inferrer/local/RD3852.scala | 14 +- .../inferrer/local/TextTypeInferrerTest.scala | 4 +- .../inferrer/local/json/JsonOrTypeTest.scala | 9 +- .../local/xml/XmlTypeReaderTest.scala | 4 +- .../snapi/frontend}/rql2/Antlr4LSPTests.scala | 29 +- .../frontend}/rql2/Antlr4TypeTests.scala | 31 +- .../FrontendSyntaxAnalyzerCompareTest.scala | 10 +- .../rql2/OldFrontendSyntaxAnalyzerTest.scala | 35 +- .../frontend}/rql2/PrettyPrintTest.scala | 6 +- .../rql2/SyntaxAnalyzerCompareTest.scala | 10 +- .../dropbox/DropboxTestContext.scala | 2 +- .../local/LocalLocationsTestContext.scala | 5 +- .../main/java/raw/readme.md => README.md} | 0 .../snapi/parser}/grammar/SnapiLexer.g4 | 0 .../snapi/parser}/grammar/SnapiParser.g4 | 0 snapi-parser/src/main/java/module-info.java | 2 +- .../snapi/truffle/emitter}/TruffleArg.java | 6 +- .../truffle/emitter}/TruffleEmitter.java | 16 +- .../emitter}/TruffleEntryExtension.java | 10 +- .../emitter}/TruffleShortEntryExtension.java | 10 +- .../emitter}/builtin/CompilerScalaConsts.java | 6 +- .../truffle/emitter}/builtin/WithArgs.java | 8 +- .../TruffleAwsV4SignedRequestEntry.java | 30 +- .../TruffleBinaryBase64Entry.java | 14 +- .../TruffleBinaryReadEntry.java | 14 +- .../TruffleFromStringBinaryEntry.java | 14 +- .../byte_extension/TruffleByteFromEntry.java | 16 +- .../TruffleBuildCollectionEntry.java | 16 +- .../TruffleCountCollectionEntry.java | 20 +- .../TruffleDistinctCollectionEntry.java | 22 +- .../TruffleEmptyCollectionEntry.java | 16 +- .../TruffleExistsCollectionEntry.java | 18 +- .../TruffleFilterCollectionEntry.java | 18 +- .../TruffleFirstCollectionEntry.java | 16 +- .../TruffleFromCollectionEntry.java | 16 +- .../TruffleGroupCollectionEntry.java | 20 +- ...ruffleInternalEquiJoinCollectionEntry.java | 24 +- .../TruffleInternalJoinCollectionEntry.java | 24 +- .../TruffleLastCollectionEntry.java | 20 +- .../TruffleMaxCollectionEntry.java | 20 +- .../TruffleMinCollectionEntry.java | 20 +- .../TruffleMkStringCollectionEntry.java | 20 +- .../TruffleOrderByCollectionEntry.java | 24 +- .../TruffleSumCollectionEntry.java | 20 +- .../TruffleTakeCollectionEntry.java | 16 +- .../TruffleTransformCollectionEntry.java | 16 +- .../TruffleTupleAvgCollectionEntry.java | 18 +- .../TruffleUnionCollectionEntry.java | 16 +- .../TruffleUnnestCollectionEntry.java | 16 +- .../TruffleZipCollectionEntry.java | 16 +- .../builtin/csv_extension/CsvParser.java | 30 +- .../csv_extension/TruffleCsvParseEntry.java | 16 +- .../csv_extension/TruffleCsvReadEntry.java | 16 +- .../TruffleDateAddIntervalEntry.java | 14 +- .../date_extension/TruffleDateBuildEntry.java | 14 +- .../date_extension/TruffleDateDayEntry.java | 14 +- .../TruffleDateFromEpochDayEntry.java | 14 +- .../TruffleDateFromTimestampEntry.java | 14 +- .../date_extension/TruffleDateMonthEntry.java | 14 +- .../date_extension/TruffleDateNowEntry.java | 14 +- .../date_extension/TruffleDateParseEntry.java | 14 +- .../TruffleDateSubtractEntry.java | 14 +- .../TruffleDateSubtractIntervalEntry.java | 14 +- .../date_extension/TruffleDateYearEntry.java | 14 +- .../TruffleDecimalFromEntry.java | 16 +- .../TruffleDecimalRoundEntry.java | 14 +- .../TruffleDoubleFromEntry.java | 16 +- .../TruffleEnvironmentParameterEntry.java | 18 +- .../TruffleEnvironmentScopesEntry.java | 14 +- .../TruffleEnvironmentSecretEntry.java | 14 +- .../TruffleErrorBuildEntry.java | 16 +- .../TruffleErrorBuildWithTypeEntry.java | 16 +- .../error_extension/TruffleErrorGetEntry.java | 16 +- .../TruffleFloatFromEntry.java | 16 +- .../TruffleFunctionInvokeAfterEntry.java | 16 +- .../http_extension/TruffleHttpCallEntry.java | 20 +- .../TruffleHttpDeleteEntry.java | 2 +- .../http_extension/TruffleHttpGetEntry.java | 2 +- .../http_extension/TruffleHttpHeadEntry.java | 2 +- .../TruffleHttpOptionsEntry.java | 2 +- .../http_extension/TruffleHttpPatchEntry.java | 2 +- .../http_extension/TruffleHttpPostEntry.java | 2 +- .../http_extension/TruffleHttpPutEntry.java | 2 +- .../http_extension/TruffleHttpReadEntry.java | 14 +- .../http_extension/TruffleHttpUrlDecode.java | 14 +- .../http_extension/TruffleHttpUrlEncode.java | 14 +- .../int_extension/TruffleIntFromEntry.java | 16 +- .../int_extension/TruffleIntRangeEntry.java | 18 +- .../TruffleBuildIntervalEntry.java | 18 +- .../TruffleIntervalDaysEntry.java | 14 +- .../TruffleIntervalFromMillisEntry.java | 14 +- .../TruffleIntervalHoursEntry.java | 14 +- .../TruffleIntervalMillisEntry.java | 14 +- .../TruffleIntervalMinutesEntry.java | 14 +- .../TruffleIntervalMonthsEntry.java | 14 +- .../TruffleIntervalParseEntry.java | 14 +- .../TruffleIntervalSecondsEntry.java | 14 +- .../TruffleIntervalToMillisEntry.java | 14 +- .../TruffleIntervalWeeksEntry.java | 14 +- .../TruffleIntervalYearsEntry.java | 14 +- .../truffle/emitter}/builtin/jdbc/Jdbc.java | 24 +- .../builtin/json_extension/JsonParser.java | 44 +- .../json_extension/TruffleParseJsonEntry.java | 24 +- .../json_extension/TrufflePrintJsonEntry.java | 20 +- .../json_extension/TruffleReadJsonEntry.java | 26 +- .../builtin/json_extension/WithJsonArgs.java | 10 +- .../TruffleKryoDecodeEntry.java | 20 +- .../TruffleKryoEncodeEntry.java | 18 +- .../list_extension/TruffleBuildListEntry.java | 16 +- .../list_extension/TruffleCountListEntry.java | 16 +- .../list_extension/TruffleEmptyListEntry.java | 16 +- .../TruffleExistsListEntry.java | 18 +- .../TruffleFilterListEntry.java | 22 +- .../list_extension/TruffleFirstListEntry.java | 16 +- .../list_extension/TruffleFromListEntry.java | 22 +- .../list_extension/TruffleGetListEntry.java | 16 +- .../list_extension/TruffleGroupListEntry.java | 20 +- .../list_extension/TruffleLastListEntry.java | 16 +- .../list_extension/TruffleMaxListEntry.java | 22 +- .../list_extension/TruffleMinListEntry.java | 22 +- .../list_extension/TruffleSumListEntry.java | 22 +- .../list_extension/TruffleTakeListEntry.java | 16 +- .../TruffleTransformListEntry.java | 22 +- .../TruffleUnsafeFromListEntry.java | 22 +- .../TruffleLocationDescribeEntry.java | 18 +- .../TruffleLocationFromStringEntry.java | 18 +- .../TruffleLocationLlEntry.java | 16 +- .../TruffleLocationLsEntry.java | 16 +- .../long_extension/TruffleLongFromEntry.java | 16 +- .../long_extension/TruffleLongRangeEntry.java | 18 +- .../math_extension/TruffleMathAbsEntry.java | 16 +- .../math_extension/TruffleMathAcosEntry.java | 14 +- .../math_extension/TruffleMathAsinEntry.java | 14 +- .../math_extension/TruffleMathAtanEntry.java | 14 +- .../math_extension/TruffleMathAtn2Entry.java | 14 +- .../TruffleMathCeilingEntry.java | 14 +- .../math_extension/TruffleMathCosEntry.java | 14 +- .../math_extension/TruffleMathCotEntry.java | 14 +- .../TruffleMathDegreesEntry.java | 14 +- .../math_extension/TruffleMathExpEntry.java | 14 +- .../math_extension/TruffleMathFloorEntry.java | 14 +- .../math_extension/TruffleMathLog10Entry.java | 14 +- .../math_extension/TruffleMathLogEntry.java | 14 +- .../math_extension/TruffleMathPiEntry.java | 14 +- .../math_extension/TruffleMathPowerEntry.java | 14 +- .../TruffleMathRadiansEntry.java | 14 +- .../TruffleMathRandomEntry.java | 14 +- .../math_extension/TruffleMathSignEntry.java | 14 +- .../math_extension/TruffleMathSinEntry.java | 14 +- .../math_extension/TruffleMathSqrtEntry.java | 14 +- .../TruffleMathSquareEntry.java | 14 +- .../math_extension/TruffleMathTanEntry.java | 14 +- .../TruffleMySQLQueryEntry.java | 26 +- .../TruffleNullableBuildEntry.java | 16 +- .../TruffleNullableEmptyEntry.java | 16 +- .../TruffleNullableIsNullEntry.java | 18 +- .../TruffleNullableTransformEntry.java | 16 +- .../TruffleNullableUnsafeGetEntry.java | 16 +- .../TruffleFlatMapNullableTryableEntry.java | 36 +- .../TruffleOracleQueryEntry.java | 26 +- .../TrufflePostgreSQLQueryEntry.java | 26 +- .../TruffleRecordAddFieldEntry.java | 20 +- .../TruffleRecordBuildEntry.java | 20 +- .../TruffleRecordConcatEntry.java | 16 +- .../TruffleRecordFieldsEntry.java | 16 +- .../TruffleRecordGetFieldByIndexEntry.java | 16 +- .../TruffleRecordRemoveFieldEntry.java | 22 +- .../TruffleRegexFirstMatchInEntry.java | 16 +- .../TruffleRegexGroupsEntry.java | 16 +- .../TruffleRegexMatchesEntry.java | 16 +- .../TruffleRegexReplaceEntry.java | 16 +- .../s3_extension/TruffleS3BuildEntry.java | 18 +- .../TruffleShortFromEntry.java | 16 +- .../TruffleSnowflakeQueryEntry.java | 24 +- .../TruffleSQLServerQueryEntry.java | 26 +- .../TruffleBase64EntryExtension.java | 14 +- .../TruffleStringCapitalizeEntry.java | 14 +- .../TruffleStringContainsEntry.java | 14 +- .../TruffleStringCountSubStringEntry.java | 14 +- .../TruffleStringDecodeEntry.java | 14 +- .../TruffleStringEmptyEntry.java | 14 +- .../TruffleStringEncodeEntry.java | 14 +- .../TruffleStringFromEntry.java | 16 +- .../TruffleStringLTrimEntry.java | 14 +- .../TruffleStringLengthEntry.java | 14 +- ...TruffleStringLevenshteinDistanceEntry.java | 14 +- .../TruffleStringLowerEntry.java | 14 +- .../TruffleStringRTrimEntry.java | 14 +- .../TruffleStringReadEntry.java | 18 +- .../TruffleStringReadLinesEntry.java | 18 +- .../TruffleStringReplaceEntry.java | 16 +- .../TruffleStringReplicateEntry.java | 14 +- .../TruffleStringReverseEntry.java | 14 +- .../TruffleStringSplitEntry.java | 14 +- .../TruffleStringStartsWithEntry.java | 14 +- .../TruffleStringSubStringEntry.java | 14 +- .../TruffleStringTrimEntry.java | 14 +- .../TruffleStringUpperEntry.java | 14 +- .../TruffleSuccessBuildEntry.java | 16 +- .../TruffleBoolValueArgTestEntry.java | 4 +- .../TruffleByteValueArgTestEntry.java | 6 +- .../TruffleDateValueArgTestEntry.java | 4 +- .../TruffleDoubleValueArgTestEntry.java | 4 +- .../TruffleFloatValueArgTestEntry.java | 4 +- .../TruffleIntValueArgTestEntry.java | 4 +- .../TruffleIntervalValueArgTestEntry.java | 4 +- .../TruffleListValueArgTestEntry.java | 4 +- .../TruffleLongValueArgTestEntry.java | 4 +- .../test_extension/TruffleMandatoryArgs.java | 14 +- .../TruffleMandatoryExpArgsEntry.java | 4 +- .../TruffleMandatoryValueArgsEntry.java | 4 +- .../test_extension/TruffleOptionalArgs.java | 18 +- .../TruffleOptionalExpArgsTestEntry.java | 4 +- .../TruffleOptionalValueArgsTestEntry.java | 4 +- .../TruffleRecordValueArgTestEntry.java | 4 +- .../TruffleShortValueArgTestEntry.java | 4 +- ...ffleStrictArgsColPassThroughTestEntry.java | 22 +- .../TruffleStrictArgsTestEntry.java | 32 +- .../TruffleStringValueArgTestEntry.java | 4 +- .../TruffleTimeValueArgTestEntry.java | 4 +- .../TruffleTimestampValueArgTestEntry.java | 4 +- .../test_extension/TruffleValueArg.java | 14 +- .../test_extension/TruffleVarArgs.java | 16 +- .../TruffleVarExpArgsTestEntry.java | 4 +- .../TruffleVarNullableStringExpTestEntry.java | 14 +- ...ruffleVarNullableStringValueTestEntry.java | 20 +- .../TruffleVarValueArgsTestEntry.java | 4 +- .../TruffleTimeAddIntervalEntry.java | 14 +- .../time_extension/TruffleTimeBuildEntry.java | 14 +- .../time_extension/TruffleTimeHourEntry.java | 14 +- .../TruffleTimeMillisEntry.java | 14 +- .../TruffleTimeMinuteEntry.java | 14 +- .../time_extension/TruffleTimeNowEntry.java | 14 +- .../time_extension/TruffleTimeParseEntry.java | 14 +- .../TruffleTimeSecondEntry.java | 14 +- .../TruffleTimeSubtractEntry.java | 14 +- .../TruffleTimeSubtractIntervalEntry.java | 14 +- .../TruffleTimestampAddIntervalEntry.java | 14 +- .../TruffleTimestampBuildEntry.java | 14 +- .../TruffleTimestampDayEntry.java | 14 +- .../TruffleTimestampFromDateEntry.java | 14 +- ...ruffleTimestampFromUnixTimestampEntry.java | 14 +- .../TruffleTimestampHourEntry.java | 14 +- .../TruffleTimestampMillisEntry.java | 14 +- .../TruffleTimestampMinuteEntry.java | 14 +- .../TruffleTimestampMonthEntry.java | 14 +- .../TruffleTimestampNowEntry.java | 14 +- .../TruffleTimestampParseEntry.java | 14 +- .../TruffleTimestampRangeEntry.java | 20 +- .../TruffleTimestampSecondEntry.java | 14 +- .../TruffleTimestampSubtractEntry.java | 14 +- ...TruffleTimestampSubtractIntervalEntry.java | 14 +- .../TruffleTimestampTimeBucketEntry.java | 24 +- .../TruffleTimestampToUnixTimestampEntry.java | 14 +- .../TruffleTimestampYearEntry.java | 14 +- .../try_extension/TruffleTryFlatMapEntry.java | 16 +- .../try_extension/TruffleTryIsErrorEntry.java | 16 +- .../TruffleTryIsSuccessEntry.java | 16 +- .../TruffleTryTransformEntry.java | 16 +- .../TruffleTryUnsafeGetEntry.java | 16 +- .../type_extension/TruffleTypeCastEntry.java | 14 +- .../type_extension/TruffleTypeEmptyEntry.java | 18 +- .../type_extension/TruffleTypeMatchEntry.java | 22 +- .../TruffleTypeProtectCastEntry.java | 22 +- .../xml_extension/TruffleParseXmlEntry.java | 36 +- .../xml_extension/TruffleReadXmlEntry.java | 36 +- .../builtin/xml_extension/XmlRecurse.java | 16 +- .../emitter}/compiler/SlotLocation.java | 2 +- .../emitter/compiler/SnapiTruffleEmitter.java | 659 +++++++++++++++ .../emitter}/compiler/TruffleBuildBody.java | 4 +- .../emitter}/compiler/TruffleEmit.java | 28 +- .../emitter}/compiler/TruffleEntrypoint.java | 4 +- .../emitter/output}/CompilerScalaConsts.java | 6 +- .../truffle/emitter/output}/CsvWriter.java | 16 +- .../truffle/emitter/output}/JsonWriter.java | 18 +- .../emitter/output}/TruffleBinaryWriter.java | 20 +- .../truffle/runtime}/ExpressionNode.java | 8 +- .../snapi/truffle/runtime}/PropertyType.java | 2 +- .../snapi/truffle/runtime}/RawContext.java | 17 +- .../snapi/truffle/runtime}/RawLanguage.java | 46 +- .../truffle/runtime}/RawLanguageCache.java | 14 +- .../snapi/truffle/runtime}/RawOptions.java | 2 +- .../snapi/truffle/runtime}/RawTypes.java | 8 +- .../snapi/truffle/runtime}/StatementNode.java | 2 +- .../truffle/runtime}/ast/BinaryNode.java | 4 +- .../runtime}/ast/ProgramExpressionNode.java | 6 +- .../runtime}/ast/ProgramStatementNode.java | 6 +- .../truffle/runtime}/ast/TypeGuards.java | 4 +- .../ast/controlflow/ExpBlockNode.java | 6 +- .../ast/controlflow/IfThenElseNode.java | 6 +- .../aggregation/AggregateMultipleNode.java | 22 +- .../aggregation/AggregateSingleNode.java | 22 +- .../expressions/aggregation/Aggregations.java | 2 +- .../aggregation/AggregatorNodes.java | 8 +- .../ast/expressions/binary/AndNode.java | 10 +- .../ast/expressions/binary/DivNode.java | 8 +- .../ast/expressions/binary/EqNode.java | 10 +- .../ast/expressions/binary/GeNode.java | 10 +- .../ast/expressions/binary/GtNode.java | 10 +- .../ast/expressions/binary/LeNode.java | 10 +- .../ast/expressions/binary/LtNode.java | 10 +- .../ast/expressions/binary/ModNode.java | 6 +- .../ast/expressions/binary/MultNode.java | 6 +- .../ast/expressions/binary/OrNode.java | 10 +- .../ast/expressions/binary/PlusNode.java | 10 +- .../ast/expressions/binary/SubNode.java | 6 +- .../aws_package/AwsV4SignedRequestNode.java | 22 +- .../binary_package/BinaryBase64Node.java | 6 +- .../binary_package/BinaryFromStringNode.java | 6 +- .../binary_package/BinaryReadNode.java | 16 +- .../EnvironmentParameterNode.java | 14 +- .../EnvironmentScopesNode.java | 8 +- .../EnvironmentSecretNode.java | 12 +- .../FunctionInvokeAfterNode.java | 8 +- .../builtin/http_package/HttpReadNode.java | 28 +- .../http_package/HttpUrlDecodeNode.java | 4 +- .../http_package/HttpUrlEncodeNode.java | 4 +- .../builtin/jdbc/JdbcQueryNode.java | 16 +- .../LocationDescribeNode.java | 26 +- .../LocationFromHttpNode.java | 22 +- .../LocationFromMySQLCredentialNode.java | 20 +- .../LocationFromMySQLNode.java | 14 +- .../LocationFromOracleCredentialNode.java | 20 +- .../LocationFromOracleNode.java | 14 +- .../LocationFromPostgreSQLCredentialNode.java | 20 +- .../LocationFromPostgreSQLNode.java | 14 +- .../location_package/LocationFromS3Node.java | 16 +- .../LocationFromSQLServerCredentialNode.java | 20 +- .../LocationFromSQLServerNode.java | 14 +- .../LocationFromSnowflakeCredentialNode.java | 20 +- .../LocationFromSnowflakeNode.java | 20 +- .../LocationFromStringNode.java | 14 +- .../location_package/LocationLlNode.java | 26 +- .../location_package/LocationLsNode.java | 16 +- .../builtin/math_package/MathAbsNode.java | 4 +- .../builtin/math_package/MathAcosNode.java | 4 +- .../builtin/math_package/MathAsinNode.java | 4 +- .../builtin/math_package/MathAtanNode.java | 4 +- .../builtin/math_package/MathAtn2Node.java | 4 +- .../builtin/math_package/MathCeilingNode.java | 6 +- .../builtin/math_package/MathCosNode.java | 4 +- .../builtin/math_package/MathCotNode.java | 4 +- .../builtin/math_package/MathDegreesNode.java | 4 +- .../builtin/math_package/MathExpNode.java | 4 +- .../builtin/math_package/MathFloorNode.java | 6 +- .../builtin/math_package/MathLog10Node.java | 4 +- .../builtin/math_package/MathLogNode.java | 4 +- .../builtin/math_package/MathPowerNode.java | 4 +- .../builtin/math_package/MathRadiansNode.java | 4 +- .../builtin/math_package/MathSignNode.java | 4 +- .../builtin/math_package/MathSinNode.java | 4 +- .../builtin/math_package/MathSqrtNode.java | 4 +- .../builtin/math_package/MathSquareNode.java | 4 +- .../builtin/math_package/MathTanNode.java | 4 +- .../numeric/byte_package/ByteFromNode.java | 8 +- .../decimal_package/DecimalFromNode.java | 8 +- .../decimal_package/DecimalRoundNode.java | 6 +- .../double_package/DoubleFromNode.java | 8 +- .../numeric/float_package/FloatFromNode.java | 8 +- .../numeric/int_package/IntFromNode.java | 12 +- .../numeric/int_package/IntRangeNode.java | 8 +- .../numeric/long_package/LongFromNode.java | 8 +- .../numeric/long_package/LongRangeNode.java | 8 +- .../numeric/short_package/ShortFromNode.java | 8 +- .../builtin/regex_package/RegexCache.java | 2 +- .../regex_package/RegexFirstMatchInNode.java | 8 +- .../regex_package/RegexGroupsNode.java | 10 +- .../regex_package/RegexMatchesNode.java | 6 +- .../regex_package/RegexReplaceNode.java | 6 +- .../string_package/StringBase64Node.java | 4 +- .../string_package/StringCapitalizeNode.java | 4 +- .../string_package/StringContainsNode.java | 4 +- .../StringCountSubStringNode.java | 4 +- .../string_package/StringDecodeNode.java | 10 +- .../string_package/StringEmptyNode.java | 4 +- .../string_package/StringEncodeNode.java | 10 +- .../string_package/StringFromNode.java | 8 +- .../string_package/StringLTrimNode.java | 4 +- .../string_package/StringLengthNode.java | 4 +- .../StringLevenshteinDistanceNode.java | 4 +- .../string_package/StringLowerNode.java | 4 +- .../string_package/StringRTrimNode.java | 4 +- .../string_package/StringReadLinesNode.java | 14 +- .../string_package/StringReadNode.java | 14 +- .../string_package/StringReplaceNode.java | 4 +- .../string_package/StringReplicateNode.java | 4 +- .../string_package/StringReverseNode.java | 4 +- .../string_package/StringSplitNode.java | 6 +- .../string_package/StringStartsWithNode.java | 4 +- .../string_package/StringSubStringNode.java | 6 +- .../string_package/StringTrimNode.java | 4 +- .../string_package/StringUpperNode.java | 4 +- .../temporals/DateTimeFormatCache.java | 2 +- .../date_package/DateAddIntervalNode.java | 10 +- .../temporals/date_package/DateBuildNode.java | 8 +- .../temporals/date_package/DateDayNode.java | 6 +- .../date_package/DateFromEpochDayNode.java | 6 +- .../date_package/DateFromTimestampNode.java | 8 +- .../temporals/date_package/DateMonthNode.java | 6 +- .../temporals/date_package/DateNowNode.java | 6 +- .../temporals/date_package/DateParseNode.java | 10 +- .../DateSubtractIntervalNode.java | 10 +- .../date_package/DateSubtractNode.java | 10 +- .../temporals/date_package/DateYearNode.java | 6 +- .../interval_package/IntervalBuildNode.java | 6 +- .../interval_package/IntervalDaysNode.java | 6 +- .../IntervalFromMillisNode.java | 6 +- .../interval_package/IntervalHoursNode.java | 6 +- .../interval_package/IntervalMillisNode.java | 6 +- .../interval_package/IntervalMinutesNode.java | 6 +- .../interval_package/IntervalMonthsNode.java | 6 +- .../interval_package/IntervalNodes.java | 8 +- .../interval_package/IntervalParseNode.java | 12 +- .../interval_package/IntervalSecondsNode.java | 6 +- .../IntervalToMillisNode.java | 6 +- .../interval_package/IntervalWeeksNode.java | 6 +- .../interval_package/IntervalYearsNode.java | 6 +- .../time_package/TimeAddIntervalNode.java | 8 +- .../temporals/time_package/TimeBuildNode.java | 8 +- .../temporals/time_package/TimeHourNode.java | 6 +- .../time_package/TimeMillisNode.java | 6 +- .../time_package/TimeMinuteNode.java | 6 +- .../temporals/time_package/TimeNowNode.java | 6 +- .../temporals/time_package/TimeParseNode.java | 10 +- .../time_package/TimeSecondNode.java | 6 +- .../TimeSubtractIntervalNode.java | 8 +- .../time_package/TimeSubtractNode.java | 10 +- .../TimestampAddIntervalNode.java | 8 +- .../timestamp_package/TimestampBuildNode.java | 8 +- .../timestamp_package/TimestampDayNode.java | 6 +- .../TimestampFromDateNode.java | 8 +- .../TimestampFromUnixTimestampNode.java | 6 +- .../timestamp_package/TimestampHourNode.java | 6 +- .../TimestampMillisNode.java | 6 +- .../TimestampMinuteNode.java | 6 +- .../timestamp_package/TimestampMonthNode.java | 6 +- .../timestamp_package/TimestampNowNode.java | 6 +- .../timestamp_package/TimestampParseNode.java | 10 +- .../timestamp_package/TimestampRangeNode.java | 14 +- .../TimestampSecondNode.java | 6 +- .../TimestampSubtractIntervalNode.java | 8 +- .../TimestampSubtractNode.java | 10 +- .../TimestampTimeBucketIntervalNode.java | 12 +- .../TimestampTimeBucketStringNode.java | 8 +- .../TimestampToUnixTimestampNode.java | 6 +- .../timestamp_package/TimestampYearNode.java | 6 +- .../builtin/type_package/TypeMatchNode.java | 10 +- .../TypeProtectCastOptionNode.java | 8 +- .../TypeProtectCastTryableNode.java | 8 +- .../ast/expressions/function/ClosureNode.java | 8 +- .../ast/expressions/function/InvokeNode.java | 4 +- .../ast/expressions/function/InvokeNodes.java | 6 +- .../ast/expressions/function/MethodNode.java | 14 +- .../expressions/function/RecClosureNode.java | 8 +- .../iterable/ArrayOperationNodes.java | 10 +- .../collection/CollectionBuildNode.java | 6 +- .../collection/CollectionDistinctNode.java | 8 +- .../collection/CollectionEquiJoinNode.java | 8 +- .../collection/CollectionExistsNode.java | 22 +- .../collection/CollectionFilterNode.java | 6 +- .../collection/CollectionFirstNode.java | 14 +- .../collection/CollectionFromNode.java | 6 +- .../collection/CollectionGroupByNode.java | 8 +- .../collection/CollectionJoinNode.java | 10 +- .../collection/CollectionMkStringNode.java | 26 +- .../collection/CollectionOrderByNode.java | 10 +- .../collection/CollectionTakeNode.java | 6 +- .../collection/CollectionTransformNode.java | 6 +- .../collection/CollectionTupleAvgNode.java | 14 +- .../collection/CollectionUnionNode.java | 6 +- .../collection/CollectionUnnestNode.java | 6 +- .../collection/CollectionZipNode.java | 8 +- .../iterable/list/ListBuildNode.java | 12 +- .../iterable/list/ListCountNode.java | 6 +- .../iterable/list/ListExistsNode.java | 22 +- .../iterable/list/ListFilterNode.java | 30 +- .../iterable/list/ListFirstNode.java | 10 +- .../iterable/list/ListFromNode.java | 36 +- .../iterable/list/ListFromUnsafe.java | 30 +- .../iterable/list/ListGetNode.java | 8 +- .../iterable/list/ListGroupByNode.java | 38 +- .../iterable/list/ListLastNode.java | 10 +- .../iterable/list/ListTakeNode.java | 8 +- .../iterable/list/ListTransformNode.java | 18 +- .../expressions/literals/BinaryConstNode.java | 6 +- .../ast/expressions/literals/BoolNode.java | 4 +- .../ast/expressions/literals/ByteNode.java | 4 +- .../ast/expressions/literals/DecimalNode.java | 6 +- .../ast/expressions/literals/DoubleNode.java | 4 +- .../ast/expressions/literals/FloatNode.java | 4 +- .../ast/expressions/literals/IntNode.java | 4 +- .../literals/LocationConstNode.java | 14 +- .../ast/expressions/literals/LongNode.java | 4 +- .../ast/expressions/literals/ShortNode.java | 4 +- .../ast/expressions/literals/StringNode.java | 4 +- .../expressions/literals/UndefinedNode.java | 6 +- .../ast/expressions/literals/UnitNode.java | 4 +- .../expressions/literals/ZeroedConstNode.java | 6 +- .../expressions/option/OptionFlatMapNode.java | 10 +- .../option/OptionGetOrElseNode.java | 8 +- .../option/OptionIsDefinedNode.java | 6 +- .../ast/expressions/option/OptionMapNode.java | 10 +- .../expressions/option/OptionNoneNode.java | 6 +- .../expressions/option/OptionSomeNode.java | 4 +- .../option/OptionUnsafeGetNode.java | 10 +- .../record/RecordAddFieldNode.java | 8 +- .../expressions/record/RecordBuildNode.java | 10 +- .../expressions/record/RecordConcatNode.java | 8 +- .../expressions/record/RecordFieldsNode.java | 8 +- .../expressions/record/RecordProjNode.java | 6 +- .../record/RecordRemoveFieldNode.java | 8 +- .../record/RecordStaticInitializers.java | 8 +- .../tryable/TryableFailureNode.java | 6 +- .../tryable/TryableFailureWithTypeNode.java | 6 +- .../tryable/TryableFlatMapNode.java | 10 +- .../tryable/TryableGetFailureNode.java | 6 +- .../tryable/TryableIsFailureNode.java | 6 +- .../tryable/TryableIsSuccessNode.java | 6 +- .../expressions/tryable/TryableMapNode.java | 10 +- .../tryable/TryableNullableFlatMapNode.java | 14 +- .../tryable/TryableSuccessNode.java | 4 +- .../tryable/TryableUnsafeGetNode.java | 12 +- .../ast/expressions/unary/NegNode.java | 6 +- .../ast/expressions/unary/NotNode.java | 4 +- .../ast/expressions/unary/NotNullNode.java | 4 +- .../ast/io/binary/BinaryBytesWriterNode.java | 8 +- .../ast/io/binary/BinaryWriterNode.java | 10 +- .../io/binary/NullableBinaryWriterNode.java | 10 +- .../io/binary/TryableBinaryWriterNode.java | 12 +- .../ast/io/csv/reader/CsvParserNodes.java | 8 +- .../csv/reader/parser/BoolParseCsvNode.java | 4 +- .../csv/reader/parser/DateParseCsvNode.java | 6 +- .../reader/parser/DecimalParseCsvNode.java | 4 +- .../csv/reader/parser/DoubleParseCsvNode.java | 4 +- .../io/csv/reader/parser/IntParseCsvNode.java | 4 +- .../reader/parser/IterableParseCsvFile.java | 18 +- .../reader/parser/IterableParseCsvString.java | 16 +- .../csv/reader/parser/LongParseCsvNode.java | 4 +- .../reader/parser/OptionBoolParseCsvNode.java | 4 +- .../reader/parser/OptionByteParseCsvNode.java | 4 +- .../reader/parser/OptionDateParseCsvNode.java | 4 +- .../parser/OptionDecimalParseCsvNode.java | 4 +- .../parser/OptionDoubleParseCsvNode.java | 4 +- .../parser/OptionFloatParseCsvNode.java | 4 +- .../reader/parser/OptionIntParseCsvNode.java | 4 +- .../reader/parser/OptionLongParseCsvNode.java | 4 +- .../parser/OptionShortParseCsvNode.java | 4 +- .../parser/OptionStringParseCsvNode.java | 4 +- .../reader/parser/OptionTimeParseCsvNode.java | 4 +- .../parser/OptionTimestampParseCsvNode.java | 4 +- .../parser/OptionUndefinedParseCsvNode.java | 4 +- .../reader/parser/RawTruffleCsvParser.java | 20 +- .../parser/RawTruffleCsvParserSettings.java | 2 +- .../csv/reader/parser/RecordParseCsvNode.java | 14 +- .../csv/reader/parser/ShortParseCsvNode.java | 4 +- .../csv/reader/parser/StringParseCsvNode.java | 4 +- .../csv/reader/parser/TimeParseCsvNode.java | 6 +- .../reader/parser/TimestampParseCsvNode.java | 6 +- .../reader/parser/TryableParseCsvNode.java | 10 +- .../reader/parser/UndefinedParseCsvNode.java | 4 +- .../io/csv/writer/CsvIterableWriterNode.java | 18 +- .../ast/io/csv/writer/CsvListWriterNode.java | 16 +- .../writer/internal/BinaryWriteCsvNode.java | 8 +- .../csv/writer/internal/BoolWriteCsvNode.java | 6 +- .../csv/writer/internal/ByteWriteCsvNode.java | 6 +- .../csv/writer/internal/DateWriteCsvNode.java | 8 +- .../writer/internal/DecimalWriteCsvNode.java | 8 +- .../writer/internal/DoubleWriteCsvNode.java | 6 +- .../writer/internal/FloatWriteCsvNode.java | 6 +- .../csv/writer/internal/IntWriteCsvNode.java | 6 +- .../csv/writer/internal/LongWriteCsvNode.java | 6 +- .../writer/internal/NullableWriteCsvNode.java | 12 +- .../writer/internal/RecordWriteCsvNode.java | 14 +- .../writer/internal/ShortWriteCsvNode.java | 6 +- .../writer/internal/StringWriteCsvNode.java | 6 +- .../csv/writer/internal/TimeWriteCsvNode.java | 8 +- .../internal/TimestampWriteCsvNode.java | 8 +- .../writer/internal/TryableWriteCsvNode.java | 12 +- .../ast/io/jdbc/BinaryReadJdbcQuery.java | 6 +- .../ast/io/jdbc/BoolReadJdbcQuery.java | 4 +- .../ast/io/jdbc/ByteReadJdbcQuery.java | 4 +- .../ast/io/jdbc/DateReadJdbcQuery.java | 6 +- .../ast/io/jdbc/DecimalReadJdbcQuery.java | 6 +- .../ast/io/jdbc/DoubleReadJdbcQuery.java | 4 +- .../ast/io/jdbc/FloatReadJdbcQuery.java | 4 +- .../ast/io/jdbc/IntReadJdbcQuery.java | 4 +- .../runtime}/ast/io/jdbc/JdbcQuery.java | 12 +- .../ast/io/jdbc/LongReadJdbcQuery.java | 4 +- .../ast/io/jdbc/NullableReadJdbcQuery.java | 8 +- .../ast/io/jdbc/RecordReadJdbcQuery.java | 14 +- .../ast/io/jdbc/ShortReadJdbcQuery.java | 4 +- .../ast/io/jdbc/StringReadJdbcQuery.java | 4 +- .../ast/io/jdbc/TimeReadJdbcQuery.java | 6 +- .../ast/io/jdbc/TimestampReadJdbcQuery.java | 6 +- .../ast/io/jdbc/TryableReadJdbcQuery.java | 10 +- .../ast/io/json/reader/JsonParseNode.java | 10 +- .../ast/io/json/reader/JsonParserNodes.java | 26 +- .../ast/io/json/reader/JsonPrintNode.java | 8 +- .../json/reader/JsonReadCollectionNode.java | 10 +- .../ast/io/json/reader/JsonReadValueNode.java | 16 +- .../json/reader/TryableTopLevelWrapper.java | 8 +- .../json/reader/parser/AnyParseJsonNode.java | 6 +- .../reader/parser/BinaryParseJsonNode.java | 8 +- .../reader/parser/BooleanParseJsonNode.java | 6 +- .../json/reader/parser/ByteParseJsonNode.java | 6 +- .../reader/parser/CheckNonNullJsonNode.java | 8 +- .../json/reader/parser/DateParseJsonNode.java | 8 +- .../reader/parser/DecimalParseJsonNode.java | 8 +- .../reader/parser/DoubleParseJsonNode.java | 6 +- .../reader/parser/FloatParseJsonNode.java | 6 +- .../json/reader/parser/IntParseJsonNode.java | 6 +- .../reader/parser/IntervalParseJsonNode.java | 8 +- .../reader/parser/IterableParseJsonNode.java | 10 +- .../json/reader/parser/ListParseJsonNode.java | 28 +- .../json/reader/parser/LongParseJsonNode.java | 6 +- .../reader/parser/NullableParseJsonNode.java | 16 +- .../json/reader/parser/OrParseJsonNode.java | 18 +- .../reader/parser/RecordParseJsonNode.java | 30 +- .../reader/parser/ShortParseJsonNode.java | 6 +- .../reader/parser/StringParseJsonNode.java | 6 +- .../json/reader/parser/TimeParseJsonNode.java | 8 +- .../reader/parser/TimestampParseJsonNode.java | 8 +- .../reader/parser/TryableParseJsonNode.java | 16 +- .../reader/parser/UndefinedParseJsonNode.java | 6 +- .../ast/io/json/writer/JsonWriteNodes.java | 16 +- .../ast/io/json/writer/JsonWriterNode.java | 10 +- .../writer/internal/AnyWriteJsonNode.java | 8 +- .../writer/internal/BinaryWriteJsonNode.java | 10 +- .../writer/internal/BooleanWriteJsonNode.java | 8 +- .../writer/internal/ByteWriteJsonNode.java | 8 +- .../writer/internal/DateWriteJsonNode.java | 10 +- .../writer/internal/DecimalWriteJsonNode.java | 10 +- .../writer/internal/DoubleWriteJsonNode.java | 8 +- .../writer/internal/FloatWriteJsonNode.java | 8 +- .../writer/internal/IntWriteJsonNode.java | 8 +- .../internal/IntervalWriteJsonNode.java | 10 +- .../internal/IterableWriteJsonNode.java | 18 +- .../writer/internal/ListWriteJsonNode.java | 14 +- .../writer/internal/LongWriteJsonNode.java | 8 +- .../internal/NullableWriteJsonNode.java | 14 +- .../json/writer/internal/OrWriteJsonNode.java | 8 +- .../writer/internal/RecordWriteJsonNode.java | 16 +- .../writer/internal/ShortWriteJsonNode.java | 8 +- .../writer/internal/StringWriteJsonNode.java | 8 +- .../writer/internal/TimeWriteJsonNode.java | 10 +- .../internal/TimestampWriteJsonNode.java | 10 +- .../internal/TryableUnsafeWriteJsonNode.java | 12 +- .../writer/internal/TryableWriteJsonNode.java | 14 +- .../internal/UndefinedWriteJsonNode.java | 4 +- .../runtime}/ast/io/kryo/KryoFromNode.java | 10 +- .../runtime}/ast/io/kryo/KryoWriteNode.java | 10 +- .../AttributeParsePrimitiveXmlNode.java | 6 +- .../ast/io/xml/parser/BoolParseXmlNode.java | 4 +- .../ast/io/xml/parser/ByteParseXmlNode.java | 4 +- .../ast/io/xml/parser/DateParseXmlNode.java | 6 +- .../io/xml/parser/DecimalParseXmlNode.java | 6 +- .../ast/io/xml/parser/DoubleParseXmlNode.java | 4 +- .../parser/ElementParseXmlPrimitiveNode.java | 6 +- .../ast/io/xml/parser/FloatParseXmlNode.java | 4 +- .../ast/io/xml/parser/IntParseXmlNode.java | 4 +- .../io/xml/parser/IterableParseXmlNode.java | 10 +- .../ast/io/xml/parser/LongParseXmlNode.java | 4 +- .../io/xml/parser/NullableParseXmlNode.java | 16 +- .../io/xml/parser/OptionParseXmlTextNode.java | 8 +- .../ast/io/xml/parser/OrTypeParseXml.java | 12 +- .../io/xml/parser/RawTruffleXmlParser.java | 22 +- .../parser/RawTruffleXmlParserFactory.java | 2 +- .../parser/RawTruffleXmlParserSettings.java | 2 +- .../ast/io/xml/parser/RecordParseXmlNode.java | 24 +- .../ast/io/xml/parser/ShortParseXmlNode.java | 4 +- .../ast/io/xml/parser/StringParseXmlNode.java | 4 +- .../xml/parser/TextParseXmlPrimitiveNode.java | 6 +- .../ast/io/xml/parser/TimeParseXmlNode.java | 6 +- .../io/xml/parser/TimestampParseXmlNode.java | 6 +- .../parser/TryableParseAttributeXmlNode.java | 10 +- .../io/xml/parser/TryableParseXmlNode.java | 10 +- .../io/xml/parser/UndefinedParseXmlNode.java | 6 +- .../io/xml/parser/XmlParseCollectionNode.java | 8 +- .../ast/io/xml/parser/XmlParseValueNode.java | 6 +- .../io/xml/parser/XmlReadCollectionNode.java | 10 +- .../ast/io/xml/parser/XmlReadValueNode.java | 14 +- .../ast/local/ReadClosureVariableNode.java | 12 +- .../ast/local/ReadLocalVariableNode.java | 8 +- .../ast/local/ReadParamClosureNode.java | 4 +- .../runtime}/ast/local/ReadParamNode.java | 4 +- .../ast/local/WriteLocalVariableNode.java | 8 +- .../runtime}/ast/osr/OSRGeneratorNode.java | 6 +- .../OSRCollectionEquiJoinInitBodyNode.java | 16 +- .../bodies/OSRCollectionFilterBodyNode.java | 16 +- .../bodies/OSRCollectionJoinInitBodyNode.java | 14 +- .../bodies/OSRCollectionMkStringBodyNode.java | 12 +- .../bodies/OSRDistinctGetGeneratorNode.java | 14 +- .../osr/bodies/OSREquiJoinNextBodyNode.java | 16 +- .../ast/osr/bodies/OSRExistsBodyNode.java | 16 +- .../ast/osr/bodies/OSRJoinNextBodyNode.java | 26 +- .../bodies/OSRListEquiJoinInitBodyNode.java | 16 +- .../ast/osr/bodies/OSRListFilterBodyNode.java | 16 +- .../ast/osr/bodies/OSRListFromBodyNode.java | 8 +- .../osr/bodies/OSRListParseJsonBodyNode.java | 4 +- .../osr/bodies/OSRListTransformBodyNode.java | 16 +- .../bodies/OSRMultiAggregationBodyNode.java | 12 +- .../bodies/OSROrderByGetGeneratorNode.java | 20 +- .../bodies/OSRSingleAggregationBodyNode.java | 12 +- .../ast/osr/bodies/OSRToArrayBodyNode.java | 8 +- .../OSRCollectionFilterConditionNode.java | 8 +- .../conditions/OSRExistsConditionNode.java | 8 +- .../conditions/OSRFromBodyConditionNode.java | 4 +- .../conditions/OSRHasNextConditionNode.java | 8 +- .../OSRIsLessThanSizeConditionNode.java | 4 +- .../OSRListParseJsonConditionNode.java | 8 +- .../boundary/RawTruffleBoundaries.java | 2 +- .../treemap/TreeMapIterator.java | 6 +- .../data_structures/treemap/TreeMapNode.java | 4 +- .../data_structures/treemap/TreeMapNodes.java | 10 +- .../treemap/TreeMapObject.java | 4 +- .../treemap/TreeMapStatic.java | 2 +- .../runtime/exceptions/BreakException.java | 2 +- .../RawTruffleInternalErrorException.java | 2 +- .../RawTruffleRuntimeException.java | 2 +- .../RawTruffleUnexpectedNullException.java | 2 +- .../RawTruffleValidationException.java | 8 +- .../ReadLinesRawTruffleException.java | 4 +- .../BinaryWriterRawTruffleException.java | 4 +- .../csv/CsvExpectedNothingException.java | 6 +- .../csv/CsvParserRawTruffleException.java | 8 +- .../csv/CsvReaderRawTruffleException.java | 8 +- .../csv/CsvWriterRawTruffleException.java | 4 +- .../json/JsonExpectedNothingException.java | 2 +- .../exceptions/json/JsonOrTypeException.java | 2 +- .../json/JsonParserRawTruffleException.java | 4 +- .../json/JsonReaderRawTruffleException.java | 6 +- .../JsonRecordFieldNotFoundException.java | 2 +- .../json/JsonUnexpectedTokenException.java | 2 +- .../json/JsonWriterRawTruffleException.java | 4 +- .../rdbms/JdbcExceptionHandler.java | 6 +- .../rdbms/JdbcParserRawTruffleException.java | 4 +- .../rdbms/JdbcReaderRawTruffleException.java | 6 +- .../rdbms/MySQLExceptionHandler.java | 2 +- .../rdbms/OracleExceptionHandler.java | 2 +- .../rdbms/PostgreSQLExceptionHandler.java | 2 +- .../rdbms/SnowflakeExceptionHandler.java | 2 +- .../rdbms/SqlServerExceptionHandler.java | 2 +- .../validation/ValidationErrorMessage.java | 2 +- .../validation/ValidationErrorObject.java | 4 +- .../validation/ValidationErrorPosition.java | 4 +- .../validation/ValidationErrorRange.java | 4 +- .../xml/XmlExpectedNothingException.java | 4 +- .../xml/XmlOrTypeParserException.java | 4 +- .../xml/XmlParserRawTruffleException.java | 6 +- .../xml/XmlReaderRawTruffleException.java | 8 +- .../runtime}/runtime/function/Closure.java | 4 +- .../runtime}/runtime/function/Function.java | 2 +- .../function/FunctionExecuteNodes.java | 2 +- .../function/FunctionRegistryObject.java | 6 +- .../runtime}/runtime/function/Lambda.java | 4 +- .../runtime/function/RawFunctionRegistry.java | 2 +- .../runtime}/runtime/function/RecClosure.java | 4 +- .../generator/collection/GeneratorNodes.java | 40 +- .../collection/StaticInitializers.java | 16 +- .../abstract_generator/AbstractGenerator.java | 8 +- .../compute_next/ComputeNextNodes.java | 68 +- .../operations/EquiJoinComputeNext.java | 4 +- .../operations/FilterComputeNext.java | 2 +- .../operations/JoinComputeNext.java | 4 +- .../operations/TakeComputeNext.java | 2 +- .../operations/TransformComputeNext.java | 2 +- .../operations/UnnestComputeNext.java | 2 +- .../operations/ZipComputeNext.java | 2 +- .../sources/CsvReadComputeNext.java | 10 +- .../sources/CsvReadFromStringComputeNext.java | 10 +- .../sources/EmptyComputeNext.java | 2 +- .../sources/ExpressionComputeNext.java | 6 +- .../sources/IntRangeComputeNext.java | 4 +- .../sources/JdbcQueryComputeNext.java | 10 +- .../sources/JsonReadComputeNext.java | 6 +- .../sources/LongRangeComputeNext.java | 4 +- .../sources/ReadLinesComputeNext.java | 8 +- .../sources/TimestampRangeComputeNext.java | 8 +- .../sources/UnionComputeNext.java | 2 +- .../sources/XmlParseComputeNext.java | 8 +- .../sources/XmlReadComputeNext.java | 10 +- .../input_buffer/GroupByInputBuffer.java | 4 +- .../input_buffer/InputBufferNodes.java | 6 +- .../input_buffer/OrderByInputBuffer.java | 4 +- .../off_heap/OffHeapNodes.java | 30 +- .../distinct/DistinctMemoryGenerator.java | 8 +- .../DistinctSpilledFilesGenerator.java | 6 +- .../off_heap/distinct/OffHeapDistinct.java | 8 +- .../group_by/GroupByMemoryGenerator.java | 8 +- .../GroupBySpilledFilesGenerator.java | 8 +- .../off_heap/group_by/OffHeapGroupByKey.java | 10 +- .../off_heap/order_by/OffHeapGroupByKeys.java | 8 +- .../order_by/OrderByMemoryGenerator.java | 8 +- .../OrderBySpilledFilesGenerator.java | 8 +- .../record_shaper/RecordShaper.java | 2 +- .../record_shaper/RecordShaperNodes.java | 8 +- .../runtime/generator/list/ListGenerator.java | 6 +- .../runtime/iterable/IterableNodes.java | 36 +- .../runtime/iterable/list/ListIterable.java | 6 +- .../operations/DistinctCollection.java | 8 +- .../operations/EquiJoinCollection.java | 12 +- .../iterable/operations/FilterCollection.java | 6 +- .../operations/GroupByCollection.java | 8 +- .../iterable/operations/JoinCollection.java | 12 +- .../operations/OrderByCollection.java | 8 +- .../iterable/operations/TakeCollection.java | 6 +- .../operations/TransformCollection.java | 6 +- .../iterable/operations/UnnestCollection.java | 6 +- .../iterable/operations/ZipCollection.java | 8 +- .../iterable/sources/CsvCollection.java | 12 +- .../sources/CsvFromStringCollection.java | 10 +- .../iterable/sources/EmptyCollection.java | 8 +- .../sources/ExpressionCollection.java | 8 +- .../iterable/sources/IntRangeCollection.java | 8 +- .../iterable/sources/JdbcQueryCollection.java | 14 +- .../iterable/sources/JsonReadCollection.java | 10 +- .../iterable/sources/LongRangeCollection.java | 8 +- .../iterable/sources/ReadLinesCollection.java | 10 +- .../sources/TimestampRangeCollection.java | 12 +- .../iterable/sources/UnionCollection.java | 8 +- .../iterable/sources/XmlParseCollection.java | 10 +- .../iterable/sources/XmlReadCollection.java | 12 +- .../runtime}/runtime/kryo/KryoNodes.java | 24 +- .../runtime}/runtime/list/BooleanList.java | 4 +- .../runtime}/runtime/list/ByteList.java | 4 +- .../runtime}/runtime/list/DoubleList.java | 4 +- .../runtime}/runtime/list/FloatList.java | 4 +- .../runtime}/runtime/list/IntList.java | 4 +- .../runtime}/runtime/list/ListNodes.java | 6 +- .../runtime}/runtime/list/LongList.java | 4 +- .../runtime}/runtime/list/ObjectList.java | 4 +- .../runtime}/runtime/list/RawArrayList.java | 4 +- .../runtime}/runtime/list/ShortList.java | 4 +- .../runtime}/runtime/list/StringList.java | 4 +- .../runtime/operators/OperatorNodes.java | 24 +- .../truffle/runtime}/runtime/or/OrObject.java | 6 +- .../runtime/primitives/BinaryObject.java | 2 +- .../runtime/primitives/DateObject.java | 6 +- .../runtime/primitives/DecimalObject.java | 4 +- .../runtime/primitives/ErrorObject.java | 4 +- .../runtime/primitives/IntervalObject.java | 4 +- .../primitives/LocationKVSettingHash.java | 8 +- .../runtime/primitives/LocationObject.java | 18 +- .../runtime/primitives/NullObject.java | 2 +- .../runtime/primitives/TimeObject.java | 4 +- .../runtime/primitives/TimestampObject.java | 4 +- .../primitives/TruffleTemporalFormatter.java | 2 +- .../runtime/record/DuplicateKeyRecord.java | 6 +- .../record/DuplicateKeyRecordNodes.java | 8 +- .../runtime}/runtime/record/KeysObject.java | 2 +- .../runtime}/runtime/record/PureRecord.java | 4 +- .../runtime/record/PureRecordNodes.java | 10 +- .../runtime}/runtime/record/RecordNodes.java | 4 +- .../runtime}/tryable_nullable/Nullable.java | 4 +- .../runtime}/tryable_nullable/Tryable.java | 4 +- .../TryableNullableNodes.java | 8 +- .../snapi/truffle/runtime}/utils/IOUtils.java | 6 +- .../truffle/runtime}/utils/KryoFootPrint.java | 6 +- .../runtime}/utils/RawTruffleCharStream.java | 2 +- .../utils/RawTruffleStringCharStream.java | 2 +- .../utils/TruffleCharInputStream.java | 2 +- .../runtime}/utils/TruffleInputStream.java | 12 +- snapi-truffle/src/main/java/module-info.java | 747 ++++++++++-------- .../truffle/compiler/SnapiTruffleEmitter.java | 659 --------------- .../raw.compiler.rql2.api.EntryExtension | 418 +++++----- .../raw.client.api.CompilerServiceBuilder | 1 - .../src/main/java/module-info.java | 15 +- ...om.rawlabs.compiler.CompilerServiceBuilder | 1 + .../src/main/resources/reference.conf | 2 +- .../com/rawlabs/sql/compiler}/ErrorCode.scala | 2 +- .../NamedParametersPreparedStatement.scala | 35 +- .../sql/compiler}/ResultSetIterator.scala | 8 +- .../rawlabs/sql/compiler}/SqlCodeUtils.scala | 15 +- .../sql/compiler}/SqlCompilerService.scala | 20 +- .../compiler}/SqlCompilerServiceBuilder.scala | 7 +- .../rawlabs/sql/compiler}/SqlConnection.scala | 9 +- .../sql/compiler}/SqlConnectionPool.scala | 16 +- .../rawlabs/sql/compiler}/SqlIntervals.scala | 4 +- .../rawlabs/sql/compiler}/SqlTypesUtils.scala | 4 +- .../antlr4/RawSqlErrorListener.scala | 4 +- .../compiler}/antlr4/RawSqlPositions.scala | 2 +- .../antlr4/RawSqlSyntaxAnalyzer.scala | 6 +- .../sql/compiler}/antlr4/RawSqlVisitor.scala | 6 +- .../antlr4/RawSqlVisitorParseErrors.scala | 4 +- .../sql/compiler}/antlr4/SqlNodes.scala | 2 +- .../sql/compiler}/antlr4/SqlParam.scala | 2 +- .../compiler}/antlr4/SqlParserErrors.scala | 2 +- .../sql/compiler}/metadata/Completion.scala | 4 +- .../metadata/DotSearchWithOneItem.scala | 2 +- .../metadata/DotSearchWithTwoItems.scala | 2 +- .../metadata/UserMetadataCache.scala | 7 +- .../metadata/WordSearchWithOneItem.scala | 2 +- .../metadata/WordSearchWithThreeItems.scala | 2 +- .../metadata/WordSearchWithTwoItems.scala | 2 +- .../writers/TypedResultSetCsvWriter.scala | 24 +- .../writers/TypedResultSetJsonWriter.scala | 27 +- .../src/test/resources/example.sql | 0 .../TestNamedParametersStatement.scala | 8 +- .../sql/compiler}/TestParseIntervals.scala | 7 +- .../sql/compiler}/TestPrintIntervals.scala | 7 +- .../TestSqlCompilerServiceAirports.scala | 33 +- .../compiler}/TestSqlConnectionFailures.scala | 70 +- .../rawlabs/sql/compiler}/TestSqlParser.scala | 8 +- .../main/java/raw/readme.md => README.md} | 0 .../rawlabs/sql/parser}/grammar/PsqlLexer.g4 | 0 .../rawlabs/sql/parser}/grammar/PsqlParser.g4 | 0 sql-parser/src/main/java/module-info.java | 2 +- tests.sh | 12 +- .../src/main/java/module-info.java | 6 +- .../src/main/resources/reference.conf | 0 .../rawlabs/utils/core}/RawException.scala | 5 +- .../utils/core}/RawMBeansManager.scala | 2 +- .../com/rawlabs/utils/core}/RawService.scala | 14 +- .../com/rawlabs/utils/core}/RawSettings.scala | 2 +- .../com/rawlabs/utils/core}/RawUid.scala | 2 +- .../com/rawlabs/utils/core}/RawUtils.scala | 8 +- .../utils/core}/RawVerboseRunnable.scala | 2 +- .../utils/core}/RawMultiplyingTestSuite.scala | 2 +- .../rawlabs/utils/core}/RawTestSuite.scala | 2 +- .../utils/core}/SettingsTestContext.scala | 2 +- .../utils/core}/TrainingWheelsContext.scala | 4 +- .../src/main/java/module-info.java | 40 +- .../src/main/resources/reference.conf | 14 +- .../utils}/sources/api/Encodings.scala | 2 +- .../rawlabs/utils}/sources/api/Location.scala | 2 +- .../sources/api/LocationException.scala | 4 +- .../bytestream/api/ByteStreamException.scala | 4 +- .../bytestream/api/ByteStreamLocation.scala | 4 +- .../api/DelegatingSeekableInputStream.scala | 6 +- .../api/GenericSkippableInputStream.scala | 2 +- .../bytestream/api/InputStreamClient.scala | 2 +- .../bytestream/api/SeekableInputStream.scala | 2 +- .../bytestream/github/GitHubLocation.scala | 8 +- .../http/HttpByteStreamClient.scala | 12 +- .../http/HttpByteStreamException.scala | 4 +- .../http/HttpByteStreamLocation.scala | 6 +- .../inmemory/InMemoryByteStreamLocation.scala | 6 +- .../filesystem/api/BaseFileSystem.scala | 2 +- .../sources/filesystem/api/FileSystem.scala | 4 +- .../filesystem/api/FileSystemExceptions.scala | 4 +- .../filesystem/api/FileSystemLocation.scala | 4 +- .../filesystem/api/FileSystemMetadata.scala | 2 +- .../filesystem/dropbox/BaseDropboxPath.scala | 8 +- .../dropbox/DropboxAccessTokenPath.scala | 6 +- .../dropbox/DropboxFileSystem.scala | 12 +- .../dropbox/DropboxUsernamePasswordPath.scala | 6 +- .../filesystem/local/LocalFileSystem.scala | 8 +- .../sources/filesystem/local/LocalPath.scala | 6 +- .../sources/filesystem/mock/MockPath.scala | 6 +- .../sources/filesystem/s3/S3FileSystem.scala | 20 +- .../sources/filesystem/s3/S3InputStream.scala | 2 +- .../utils}/sources/filesystem/s3/S3Path.scala | 8 +- .../utils}/sources/jdbc/api/JdbcClient.scala | 12 +- .../jdbc/api/JdbcLocationExceptions.scala | 4 +- .../sources/jdbc/api/JdbcSchemaLocation.scala | 4 +- .../sources/jdbc/api/JdbcServerLocation.scala | 4 +- .../sources/jdbc/api/JdbcTableLocation.scala | 4 +- .../sources/jdbc/mysql/MySqlClient.scala | 6 +- .../jdbc/mysql/MySqlSchemaLocation.scala | 6 +- .../jdbc/mysql/MySqlServerLocation.scala | 6 +- .../jdbc/mysql/MySqlTableLocation.scala | 6 +- .../sources/jdbc/oracle/OracleClient.scala | 6 +- .../jdbc/oracle/OracleSchemaLocation.scala | 6 +- .../jdbc/oracle/OracleServerLocation.scala | 6 +- .../jdbc/oracle/OracleTableLocation.scala | 6 +- .../sources/jdbc/pgsql/PostgresqlClient.scala | 6 +- .../jdbc/pgsql/PostgresqlSchemaLocation.scala | 6 +- .../jdbc/pgsql/PostgresqlServerLocation.scala | 6 +- .../jdbc/pgsql/PostgresqlTableLocation.scala | 6 +- .../jdbc/snowflake/SnowflakeClient.scala | 6 +- .../snowflake/SnowflakeSchemaLocation.scala | 6 +- .../snowflake/SnowflakeServerLocation.scala | 6 +- .../snowflake/SnowflakeTableLocation.scala | 6 +- .../sources/jdbc/sqlite/SqliteClient.scala | 8 +- .../jdbc/sqlite/SqliteSchemaLocation.scala | 6 +- .../jdbc/sqlite/SqliteServerLocation.scala | 6 +- .../jdbc/sqlite/SqliteTableLocation.scala | 6 +- .../jdbc/sqlserver/SqlServerClient.scala | 6 +- .../sqlserver/SqlServerSchemaLocation.scala | 6 +- .../sqlserver/SqlServerServerLocation.scala | 6 +- .../sqlserver/SqlServerTableLocation.scala | 6 +- .../jdbc/teradata/TeradataClient.scala | 6 +- .../teradata/TeradataSchemaLocation.scala | 6 +- .../teradata/TeradataServerLocation.scala | 6 +- .../jdbc/teradata/TeradataTableLocation.scala | 6 +- .../api/TestGenericSkippableInputStream.scala | 2 +- .../http/HttpLocationsTestContext.scala | 2 +- .../bytestream/http/TestHttpServer.scala | 2 +- .../filesystem/api/TestFileSystems.scala | 4 +- .../dropbox/TestDropboxFileSystem.scala | 6 +- .../dropbox/TestRootDropboxFileSystem.scala | 4 +- .../local/TestLocalFileSystem.scala | 6 +- .../filesystem/s3/TestLargeDirectory.scala | 4 +- .../filesystem/s3/TestRootS3FileSystem.scala | 4 +- .../filesystem/s3/TestS3FileSystem.scala | 8 +- .../src/test/java/raw/testing/tags/Tier1.java | 24 - .../java/raw/testing/tags/TruffleTests.java | 24 - utils/src/test/scala/raw/utils/Tags.scala | 36 - 1401 files changed, 8922 insertions(+), 8549 deletions(-) rename {client => compiler}/src/main/java/module-info.java (71%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/CompilerService.scala (98%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/CompilerServiceBuilder.scala (88%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/CompilerServiceProvider.scala (93%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/Docs.scala (99%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/Entrypoint.scala (94%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/Errors.scala (97%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/ProgramDescription.scala (96%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/ProgramEnvironment.scala (95%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/RawTypes.scala (99%) rename {client/src/main/scala/raw/client/api => compiler/src/main/scala/com/rawlabs/compiler}/RawValues.scala (98%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/utils/RecordFieldsNaming.scala (97%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/writers/PolyglotBinaryWriter.scala (96%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/writers/PolyglotCsvWriter.scala (99%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/writers/PolyglotJsonWriter.scala (99%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/writers/PolyglotTextWriter.scala (95%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/writers/TypedPolyglotCsvWriter.scala (94%) rename {client/src/main/scala/raw/client => compiler/src/main/scala/com/rawlabs/compiler}/writers/TypedPolyglotJsonWriter.scala (93%) create mode 100644 protocol-compiler/src/main/java/com/rawlabs/protocol/compiler/Placeholder.java rename utils/src/main/scala/raw/utils/RawServiceException.scala => protocol-compiler/src/main/java/module-info.java (68%) rename {protocol/src/main/protobuf/raw/protocol => protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler}/protocol.proto (97%) rename {protocol/src/main/java/raw/protocol => protocol-raw/src/main/java/com/rawlabs/protocol/raw}/Placeholder.java (93%) rename {protocol => protocol-raw}/src/main/java/module-info.java (86%) create mode 100644 protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/types.proto create mode 100644 protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/values.proto delete mode 100644 python-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder rename {python-client => python-compiler}/.sbtopts (100%) rename {python-client => python-compiler}/.scalafmt.conf (100%) rename {python-client => python-compiler}/build.sh (100%) rename {python-client => python-compiler}/project/Dependencies.scala (100%) rename {python-client => python-compiler}/project/build.properties (100%) rename {python-client => python-compiler}/project/plugins.sbt (100%) create mode 100644 python-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder rename {python-client/src/main/scala/raw/client/python => python-compiler/src/main/scala/com/rawlabs/python/compiler}/PythonCompilerService.scala (92%) rename {python-client/src/main/scala/raw/client/python => python-compiler/src/main/scala/com/rawlabs/python/compiler}/PythonCompilerServiceBuilder.scala (77%) rename {python-client/src/test/scala/raw/client/python => python-compiler/src/test/scala/com/rawlabs/python/compiler}/TestPythonCompilerService.scala (90%) delete mode 100644 snapi-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder rename {snapi-client => snapi-compiler}/src/main/java/module-info.java (63%) create mode 100644 snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder rename {snapi-client/src/main/scala/raw/client/rql2/truffle => snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler}/CustomClassAndModuleLoader.scala (98%) rename {snapi-client/src/main/scala/raw/client/rql2/api => snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler}/Rql2CompilerService.scala (82%) rename {snapi-client/src/main/scala/raw/client/rql2/truffle => snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler}/Rql2TruffleCompilerService.scala (93%) rename {snapi-client/src/main/scala/raw/client/rql2/truffle => snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler}/Rql2TruffleCompilerServiceBuilder.scala (78%) rename {snapi-client/src/main/scala/raw/client/rql2/truffle => snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers}/Rql2CsvWriter.scala (92%) rename {snapi-client/src/main/scala/raw/client/rql2/truffle => snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers}/Rql2JsonWriter.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/api/Rql2CompilerServiceTestContext.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/api/Rql2OutputTestContext.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/FailAfterNServer.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/Rql2CompilerTestContext.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/benchmark/BenchmarkTests.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/benchmark/StressTests.scala (84%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/BinaryPackageTest.scala (85%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/BytePackageTest.scala (82%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/CsvPackageTest.scala (99%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/DatePackageTest.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/DecimalPackageTest.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/DoublePackageTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/EnvironmentPackageTest.scala (80%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/ErrorPackageTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/FloatPackageTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/FunctionPackageTest.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/HttpPackageTest.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/IntPackageTest.scala (85%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/IntervalPackageTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/JsonPackageTest.scala (99%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/LibraryPackageTest.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/LocationPackageTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/LongPackageTest.scala (83%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/MathPackageTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/NullablePackageTest.scala (79%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/NullableTryablePackageTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/RecordPackageTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/RegexPackageTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/S3PackageTest.scala (77%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/ShortPackageTest.scala (83%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/StringPackageTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/SuccessPackageTest.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/TimePackageTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/TimestampPackageTest.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/TryPackageTest.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/TypePackageTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/XmlPackageTest.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionDistinctTest.scala (74%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionExplodeTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionGroupByTest.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionJoinTest.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionMinMaxTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionMkStringTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionOrderByTest.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionPackageTest.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionRangeTest.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/collection/CollectionUnionTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/AwsPackageTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/EnvironmentPackageTest.scala (79%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/LocationPackageTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/MySQLPackageTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/OraclePackageTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/PostgreSQLPackageTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/S3PackageTest.scala (90%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/SQLServerPackageTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/credentials/SnowflakePackageTest.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListDistinctTest.scala (74%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListExplodeTest.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListGroupByTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListJoinTest.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListMinMaxTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListMkStringTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListOrderByTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListPackageTest.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/builtin/list/ListUnionTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/hints/SemanticAnalyzerHintsTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspAiValidateTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspBrokenCodeTest.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspCommentsFormatTest.scala (99%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspCompilationMessagesTest.scala (80%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspDefinitionTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspDotAutoCompleteTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspFormatCodeTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspHoverTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspRenameTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspValidateTest.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/lsp/LspWordAutoCompleteTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/KryoPackageTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/OffHeapDatasets.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/OffHeapDistinctTest.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/OffHeapEquiJoinTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/OffHeapGroupTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/OffHeapJoinTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/offheap/OffHeapOrderByTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/output/BinaryOutputTest.scala (85%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/output/CsvOutputTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/output/JsonOutputTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/output/TextOutputTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/parser/FrontendSyntaxAnalyzerTest.scala (90%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/parser/ListSugarTest.scala (74%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/parser/OperatorPrecedenceTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/parser/RecordSugarTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD10194Test.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD10220Test.scala (85%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD10723Test.scala (73%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD10767Test.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD10801Test.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD3742Test.scala (84%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD3784Test.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD4529Test.scala (83%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD4981Test.scala (82%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5238Test.scala (71%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5365Test.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5393Test.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5412Test.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5448Test.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5484Test.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5488Test.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5491Test.scala (82%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5644Test.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5679Test.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5685Test.scala (81%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5691Test.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5697Test.scala (83%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5714Test.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5722Test.scala (74%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD572Test.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5775Test.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5779Test.scala (85%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5784Test.scala (74%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5785Test.scala (81%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5786Test.scala (85%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5851Test.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5884Test.scala (83%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5893Test.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5914Test.scala (79%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5920Test.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5921Test.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5925Test.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5932Test.scala (84%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5968Test.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5971Test.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD5979Test.scala (78%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD7924Test.scala (81%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD7974Test.scala (82%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD8530Test.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD8764Test.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD8935Test.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD8993Test.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9137Test.scala (92%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9228Test.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9229Test.scala (84%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9255Test.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9359Test.scala (90%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9409Test.scala (83%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9445Test.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9479Test.scala (73%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9485Test.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9554Test.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9616Test.scala (82%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/RD9932Test.scala (78%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/credentials/RD3084Test.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/credentials/RD4445Test.scala (71%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/regressions/credentials/RD5932Test.scala (67%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BasicStagedCompilerTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpAndTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpDivTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpEqTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpGeTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpGtTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpLeTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpLtTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpModTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpMultTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpNeqTest.scala (96%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpOrTest.scala (91%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpPlusTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/BinaryExpSubTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/ClosureTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/CombinationSpecTestHelper.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/ConstTest.scala (89%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/ErrorsTest.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/FunAbsTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/IfThenElseTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/ImplicitCastTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/JoinWithTryRowsTest.scala (93%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/LetBindTest.scala (95%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/LetFunRecTest.scala (87%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/LetFunTest.scala (97%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/LetTypeTest.scala (86%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/MigrationTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/PackageNameTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/ProjTest.scala (82%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/PropagationTest.scala (98%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/StagedCompilerTest.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/UnaryExpNegTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/tests/spec/UnaryExpNotTest.scala (88%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/truffle/Rql2TruffleCompilerServiceTestContext.scala (94%) rename {snapi-client/src/test/scala/raw/compiler/rql2 => snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler}/truffle/Rql2TruffleCompilerTestContext.scala (82%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/BaseTree.scala (88%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/CompilerContext.scala (77%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/Counter.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/Keywords.scala (92%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/Phase.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/PrettyPrinter.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/ProgramContext.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/SemanticAnalyzer.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/SymbolTable.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/SyntaxAnalyzer.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/Tree.scala (92%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/TreeDescription.scala (89%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/TreeWithPositions.scala (93%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/errors/Errors.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/errors/ErrorsPrettyPrinter.scala (91%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/source/SourcePrettyPrinter.scala (88%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/base/source/SourceTree.scala (97%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/common/source/SourceTree.scala (95%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/DateTimeFormatFinder.scala (98%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/InferrerException.scala (83%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/InferrerProperties.scala (91%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/InferrerService.scala (89%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/InferrerServiceProvider.scala (76%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/InputFormatDescriptors.scala (95%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/SourceTypePrettyPrinter.scala (98%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/api/SourceTypes.scala (98%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/EncodingInferrer.scala (92%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/InferrerErrorHandler.scala (94%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/LocalInferrerException.scala (80%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/LocalInferrerService.scala (91%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/MergeTypes.scala (98%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/TextTypeInferrer.scala (98%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/auto/AutoInferrer.scala (86%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/auto/InferrerBufferedSeekableIS.scala (96%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/csv/CsvInferrer.scala (87%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/csv/CsvMergeTypes.scala (79%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/csv/CsvTypeSniffer.scala (98%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/hjson/HjsonInferrer.scala (83%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/jdbc/JdbcInferrer.scala (89%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/jdbc/JdbcTypeToSourceType.scala (93%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/json/JsonInferrer.scala (92%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/json/JsonUtils.scala (94%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/text/TextInferrer.scala (93%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/text/TextLineIterator.scala (90%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/xml/InferrerXmlTypeReader.scala (96%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/xml/XmlInferrer.scala (85%) rename snapi-frontend/src/main/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/xml/XmlMergeTypes.scala (93%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/CommonSemanticAnalyzer.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/FrontendSyntaxAnalyzer.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/ImplicitCasts.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Keywords.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/ListProjDesugarer.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/PipelinedPhase.scala (82%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/ProgramContext.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Propagation.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Rql2ProgramContext.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Rql2TypeUtils.scala (92%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/SemanticAnalyzer.scala (99%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/StagedCompiler.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/SugarExtensionDesugarer.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/SymbolTable.scala (82%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/SyntaxAnalyzer.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Tree.scala (77%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/TreeWithPositions.scala (73%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/Antlr4SyntaxAnalyzer.scala (89%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/ParserErrors.scala (90%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/RawErrorListener.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/RawPositions.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/RawSnapiVisitor.scala (99%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/antlr4/RawVisitorParseErrors.scala (87%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/api/LocationDescription.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/api/PackageExtension.scala (95%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/api/Values.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/Aggregations.scala (88%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/AwsPackage.scala (91%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/BinaryPackage.scala (89%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/BinaryPackageBuilder.scala (79%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/BytePackage.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/BytePackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/CollectionPackage.scala (99%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/CollectionPackageBuilder.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/CsvPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/DatePackage.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/DatePackageBuilder.scala (86%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/DecimalPackage.scala (87%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/DecimalPackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/DoublePackage.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/DoublePackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/EnvironmentPackage.scala (84%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/EnvironmentPackageBuilder.scala (76%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/ErrorPackage.scala (87%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/ErrorPackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/FloatPackage.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/FloatPackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/FunctionPackage.scala (81%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/HttpPackage.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/IntPackage.scala (90%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/IntPackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/IntervalPackage.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/IntervalPackageBuilder.scala (89%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/JsonPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/KryoPackage.scala (85%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/LibraryPackage.scala (93%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/ListPackage.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/ListPackageBuilder.scala (90%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/LocationPackage.scala (95%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/LocationPackageBuilder.scala (80%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/LongPackage.scala (90%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/LongPackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/MathPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/MySQLPackage.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/NullablePackage.scala (91%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/NullablePackageBuilder.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/NullableTryablePackage.scala (81%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/NullableTryablePackageBuilder.scala (80%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/OraclePackage.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/PostgreSQLPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/RecordPackage.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/RecordPackageBuilder.scala (91%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/RegexPackage.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/S3Package.scala (85%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/SQLServerPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/ShortPackage.scala (83%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/ShortPackageBuilder.scala (78%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/SnowflakePackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/StringPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/SuccessPackage.scala (77%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/SuccessPackageBuilder.scala (79%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TestPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TimePackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TimePackageBuilder.scala (89%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TimestampPackage.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TimestampPackageBuilder.scala (89%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TryPackage.scala (93%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TryPackageBuilder.scala (85%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TypePackage.scala (94%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/TypePackageBuilder.scala (82%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/builtin/XmlPackage.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/errors/Errors.scala (97%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/errors/ErrorsPrettyPrinter.scala (90%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/lsp/CompilerLspService.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/lsp/LspSyntaxAnalyzer.scala (88%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/source/SourceCommentsPrettyPrinter.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/source/SourcePrettyPrinter.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/source/SourceTree.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/utils/Attribution.scala (98%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/utils/ExtraRewriters.scala (96%) rename snapi-frontend/src/main/scala/{raw/compiler => com/rawlabs/snapi/frontend}/utils/package.scala (96%) delete mode 100644 snapi-frontend/src/main/scala/raw/compiler/common/PhaseDescriptor.scala delete mode 100644 snapi-frontend/src/main/scala/raw/compiler/rql2/api/EntryExtensionProvider.scala delete mode 100644 snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtensionProvider.scala rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/InferrerBufferedSeekableIsTest.scala (94%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/LocalInferrerTest.scala (96%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/LocalInferrerTestContext.scala (77%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/RD10260.scala (88%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/RD10439.scala (82%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/RD3852.scala (74%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/TextTypeInferrerTest.scala (98%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/json/JsonOrTypeTest.scala (92%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/snapi/frontend}/inferrer/local/xml/XmlTypeReaderTest.scala (98%) rename snapi-frontend/src/test/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Antlr4LSPTests.scala (93%) rename snapi-frontend/src/test/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/Antlr4TypeTests.scala (93%) rename snapi-frontend/src/test/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/FrontendSyntaxAnalyzerCompareTest.scala (98%) rename snapi-frontend/src/test/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/OldFrontendSyntaxAnalyzerTest.scala (94%) rename snapi-frontend/src/test/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/PrettyPrintTest.scala (98%) rename snapi-frontend/src/test/scala/{raw/compiler => com/rawlabs/snapi/frontend}/rql2/SyntaxAnalyzerCompareTest.scala (93%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/utils}/sources/filesystem/dropbox/DropboxTestContext.scala (95%) rename snapi-frontend/src/test/scala/{raw => com/rawlabs/utils}/sources/filesystem/local/LocalLocationsTestContext.scala (99%) rename snapi-parser/{src/main/java/raw/readme.md => README.md} (100%) rename snapi-parser/src/main/java/{raw/snapi => com/rawlabs/snapi/parser}/grammar/SnapiLexer.g4 (100%) rename snapi-parser/src/main/java/{raw/snapi => com/rawlabs/snapi/parser}/grammar/SnapiParser.g4 (100%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/TruffleArg.java (75%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/TruffleEmitter.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/TruffleEntryExtension.java (81%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/TruffleShortEntryExtension.java (85%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/CompilerScalaConsts.java (75%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/WithArgs.java (85%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java (81%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/binary_extension/TruffleBinaryBase64Entry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/binary_extension/TruffleBinaryReadEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/binary_extension/TruffleFromStringBinaryEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/byte_extension/TruffleByteFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleBuildCollectionEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleCountCollectionEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleDistinctCollectionEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleEmptyCollectionEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleExistsCollectionEntry.java (72%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleFilterCollectionEntry.java (71%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleFirstCollectionEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleFromCollectionEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleGroupCollectionEntry.java (80%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java (75%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java (75%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleLastCollectionEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleMaxCollectionEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleMinCollectionEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleMkStringCollectionEntry.java (76%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleOrderByCollectionEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleSumCollectionEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleTakeCollectionEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleTransformCollectionEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java (67%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleUnionCollectionEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleUnnestCollectionEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/collection_extension/TruffleZipCollectionEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/csv_extension/CsvParser.java (86%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/csv_extension/TruffleCsvParseEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/csv_extension/TruffleCsvReadEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateAddIntervalEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateBuildEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateDayEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateFromEpochDayEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateFromTimestampEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateMonthEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateNowEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateParseEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateSubtractEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateSubtractIntervalEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/date_extension/TruffleDateYearEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/decimal_extension/TruffleDecimalFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/decimal_extension/TruffleDecimalRoundEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/double_extension/TruffleDoubleFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/environment_extension/TruffleEnvironmentParameterEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/environment_extension/TruffleEnvironmentScopesEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/environment_extension/TruffleEnvironmentSecretEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/error_extension/TruffleErrorBuildEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/error_extension/TruffleErrorGetEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/float_extension/TruffleFloatFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpCallEntry.java (73%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpDeleteEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpGetEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpHeadEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpOptionsEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpPatchEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpPostEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpPutEntry.java (88%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpReadEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpUrlDecode.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/http_extension/TruffleHttpUrlEncode.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/int_extension/TruffleIntFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/int_extension/TruffleIntRangeEntry.java (62%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleBuildIntervalEntry.java (80%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalDaysEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalFromMillisEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalHoursEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalMillisEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalMinutesEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalMonthsEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalParseEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalSecondsEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalToMillisEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalWeeksEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/interval_extension/TruffleIntervalYearsEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/jdbc/Jdbc.java (80%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/json_extension/JsonParser.java (79%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/json_extension/TruffleParseJsonEntry.java (60%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/json_extension/TrufflePrintJsonEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/json_extension/TruffleReadJsonEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/json_extension/WithJsonArgs.java (76%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/kryo_extension/TruffleKryoDecodeEntry.java (55%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/kryo_extension/TruffleKryoEncodeEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleBuildListEntry.java (59%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleCountListEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleEmptyListEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleExistsListEntry.java (72%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleFilterListEntry.java (74%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleFirstListEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleFromListEntry.java (72%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleGetListEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleGroupListEntry.java (80%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleLastListEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleMaxListEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleMinListEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleSumListEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleTakeListEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleTransformListEntry.java (73%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/list_extension/TruffleUnsafeFromListEntry.java (72%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/location_extension/TruffleLocationDescribeEntry.java (61%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/location_extension/TruffleLocationFromStringEntry.java (55%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/location_extension/TruffleLocationLlEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/location_extension/TruffleLocationLsEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/long_extension/TruffleLongFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/long_extension/TruffleLongRangeEntry.java (62%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathAbsEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathAcosEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathAsinEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathAtanEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathAtn2Entry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathCeilingEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathCosEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathCotEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathDegreesEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathExpEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathFloorEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathLog10Entry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathLogEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathPiEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathPowerEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathRadiansEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathRandomEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathSignEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathSinEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathSqrtEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathSquareEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/math_extension/TruffleMathTanEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/mysql_extension/TruffleMySQLQueryEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/nullable_extension/TruffleNullableBuildEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/nullable_extension/TruffleNullableEmptyEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/nullable_extension/TruffleNullableIsNullEntry.java (54%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/nullable_extension/TruffleNullableTransformEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java (66%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/oracle_extension/TruffleOracleQueryEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/record_extension/TruffleRecordAddFieldEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/record_extension/TruffleRecordBuildEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/record_extension/TruffleRecordConcatEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/record_extension/TruffleRecordFieldsEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/record_extension/TruffleRecordRemoveFieldEntry.java (68%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/regex_extension/TruffleRegexGroupsEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/regex_extension/TruffleRegexMatchesEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/regex_extension/TruffleRegexReplaceEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/s3_extension/TruffleS3BuildEntry.java (61%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/short_extension/TruffleShortFromEntry.java (55%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java (60%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleBase64EntryExtension.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringCapitalizeEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringContainsEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringCountSubStringEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringDecodeEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringEmptyEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringEncodeEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringFromEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringLTrimEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringLengthEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringLowerEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringRTrimEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringReadEntry.java (61%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringReadLinesEntry.java (61%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringReplaceEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringReplicateEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringReverseEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringSplitEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringStartsWithEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringSubStringEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringTrimEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/string_extension/TruffleStringUpperEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/success_extension/TruffleSuccessBuildEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleBoolValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleByteValueArgTestEntry.java (71%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleDateValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleDoubleValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleFloatValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleIntValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleIntervalValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleListValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleLongValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleMandatoryArgs.java (60%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleMandatoryExpArgsEntry.java (78%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleMandatoryValueArgsEntry.java (78%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleOptionalArgs.java (60%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleRecordValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleShortValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java (52%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleStrictArgsTestEntry.java (52%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleStringValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleTimeValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleTimestampValueArgTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleValueArg.java (61%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleVarArgs.java (59%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleVarExpArgsTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java (61%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java (56%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/test_extension/TruffleVarValueArgsTestEntry.java (77%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeAddIntervalEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeBuildEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeHourEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeMillisEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeMinuteEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeNowEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeParseEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeSecondEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeSubtractEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampBuildEntry.java (65%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampDayEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampHourEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampMillisEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampMonthEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampNowEntry.java (62%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampParseEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampRangeEntry.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampSecondEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java (52%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/timestamp_extension/TruffleTimestampYearEntry.java (63%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/try_extension/TruffleTryFlatMapEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/try_extension/TruffleTryIsErrorEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/try_extension/TruffleTryIsSuccessEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/try_extension/TruffleTryTransformEntry.java (58%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/try_extension/TruffleTryUnsafeGetEntry.java (57%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/type_extension/TruffleTypeCastEntry.java (60%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/type_extension/TruffleTypeEmptyEntry.java (55%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/type_extension/TruffleTypeMatchEntry.java (72%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/type_extension/TruffleTypeProtectCastEntry.java (84%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/xml_extension/TruffleParseXmlEntry.java (81%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/xml_extension/TruffleReadXmlEntry.java (81%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/builtin/xml_extension/XmlRecurse.java (92%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/compiler/SlotLocation.java (89%) create mode 100644 snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/compiler/TruffleBuildBody.java (80%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/compiler/TruffleEmit.java (64%) rename snapi-truffle/src/main/java/{raw/compiler/snapi/truffle => com/rawlabs/snapi/truffle/emitter}/compiler/TruffleEntrypoint.java (89%) rename snapi-truffle/src/main/java/{raw/compiler/rql2output/truffle/builtin => com/rawlabs/snapi/truffle/emitter/output}/CompilerScalaConsts.java (75%) rename snapi-truffle/src/main/java/{raw/compiler/rql2output/truffle/builtin => com/rawlabs/snapi/truffle/emitter/output}/CsvWriter.java (85%) rename snapi-truffle/src/main/java/{raw/compiler/rql2output/truffle/builtin => com/rawlabs/snapi/truffle/emitter/output}/JsonWriter.java (85%) rename snapi-truffle/src/main/java/{raw/compiler/rql2output/truffle/builtin => com/rawlabs/snapi/truffle/emitter/output}/TruffleBinaryWriter.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ExpressionNode.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/PropertyType.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/RawContext.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/RawLanguage.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/RawLanguageCache.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/RawOptions.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/RawTypes.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/StatementNode.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/BinaryNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/ProgramExpressionNode.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/ProgramStatementNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/TypeGuards.java (98%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/controlflow/ExpBlockNode.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/controlflow/IfThenElseNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/aggregation/AggregateMultipleNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/aggregation/AggregateSingleNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/aggregation/Aggregations.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/aggregation/AggregatorNodes.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/AndNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/DivNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/EqNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/GeNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/GtNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/LeNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/LtNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/ModNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/MultNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/OrNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/PlusNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/binary/SubNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/binary_package/BinaryBase64Node.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/binary_package/BinaryFromStringNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/binary_package/BinaryReadNode.java (66%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java (69%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/http_package/HttpReadNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/jdbc/JdbcQueryNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationDescribeNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromHttpNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromMySQLNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromOracleNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromS3Node.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationFromStringNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationLlNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/location_package/LocationLsNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathAbsNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathAcosNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathAsinNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathAtanNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathAtn2Node.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathCeilingNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathCosNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathCotNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathDegreesNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathExpNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathFloorNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathLog10Node.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathLogNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathPowerNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathRadiansNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathSignNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathSinNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathSqrtNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathSquareNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/math_package/MathTanNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/float_package/FloatFromNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/int_package/IntFromNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/int_package/IntRangeNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/long_package/LongFromNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/long_package/LongRangeNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/numeric/short_package/ShortFromNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/regex_package/RegexCache.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/regex_package/RegexGroupsNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/regex_package/RegexMatchesNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/regex_package/RegexReplaceNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringBase64Node.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringCapitalizeNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringContainsNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringCountSubStringNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringDecodeNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringEmptyNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringEncodeNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringFromNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringLTrimNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringLengthNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringLowerNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringRTrimNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringReadLinesNode.java (64%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringReadNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringReplaceNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringReplicateNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringReverseNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringSplitNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringStartsWithNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringSubStringNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringTrimNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/string_package/StringUpperNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/DateTimeFormatCache.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateBuildNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateDayNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateMonthNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateNowNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateParseNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/date_package/DateYearNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeHourNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeNowNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeParseNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java (67%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/type_package/TypeMatchNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/function/ClosureNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/function/InvokeNode.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/function/InvokeNodes.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/function/MethodNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/function/RecClosureNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/ArrayOperationNodes.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionBuildNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionDistinctNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionEquiJoinNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionExistsNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionFilterNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionFirstNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionFromNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionGroupByNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionJoinNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionMkStringNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionOrderByNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionTakeNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionTransformNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionTupleAvgNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionUnionNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionUnnestNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/collection/CollectionZipNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListBuildNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListCountNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListExistsNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListFilterNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListFirstNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListFromNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListFromUnsafe.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListGetNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListGroupByNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListLastNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListTakeNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/iterable/list/ListTransformNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/BinaryConstNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/BoolNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/ByteNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/DecimalNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/DoubleNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/FloatNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/IntNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/LocationConstNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/LongNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/ShortNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/StringNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/UndefinedNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/UnitNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/literals/ZeroedConstNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionFlatMapNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionGetOrElseNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionIsDefinedNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionMapNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionNoneNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionSomeNode.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/option/OptionUnsafeGetNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordAddFieldNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordBuildNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordConcatNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordFieldsNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordProjNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordRemoveFieldNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/record/RecordStaticInitializers.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableFailureNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableFailureWithTypeNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableFlatMapNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableGetFailureNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableIsFailureNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableIsSuccessNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableMapNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableNullableFlatMapNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableSuccessNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/tryable/TryableUnsafeGetNode.java (72%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/unary/NegNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/unary/NotNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/expressions/unary/NotNullNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/binary/BinaryBytesWriterNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/binary/BinaryWriterNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/binary/NullableBinaryWriterNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/binary/TryableBinaryWriterNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/CsvParserNodes.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/BoolParseCsvNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/DateParseCsvNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/DecimalParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/DoubleParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/IntParseCsvNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/IterableParseCsvFile.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/IterableParseCsvString.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/LongParseCsvNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionByteParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionDateParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionIntParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionLongParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionShortParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionStringParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/RawTruffleCsvParser.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/RecordParseCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/ShortParseCsvNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/StringParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/TimeParseCsvNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/TimestampParseCsvNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/TryableParseCsvNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/reader/parser/UndefinedParseCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/CsvIterableWriterNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/CsvListWriterNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/BinaryWriteCsvNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/BoolWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/ByteWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/DateWriteCsvNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/DecimalWriteCsvNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/DoubleWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/FloatWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/IntWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/LongWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/NullableWriteCsvNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/RecordWriteCsvNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/ShortWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/StringWriteCsvNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/TimeWriteCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/TimestampWriteCsvNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/csv/writer/internal/TryableWriteCsvNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/BinaryReadJdbcQuery.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/BoolReadJdbcQuery.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/ByteReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/DateReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/DecimalReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/DoubleReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/FloatReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/IntReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/JdbcQuery.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/LongReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/NullableReadJdbcQuery.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/RecordReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/ShortReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/StringReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/TimeReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/TimestampReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/jdbc/TryableReadJdbcQuery.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/JsonParseNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/JsonParserNodes.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/JsonPrintNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/JsonReadCollectionNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/JsonReadValueNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/TryableTopLevelWrapper.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/AnyParseJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/BinaryParseJsonNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/BooleanParseJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/ByteParseJsonNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/CheckNonNullJsonNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/DateParseJsonNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/DecimalParseJsonNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/DoubleParseJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/FloatParseJsonNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/IntParseJsonNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/IntervalParseJsonNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/IterableParseJsonNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/ListParseJsonNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/LongParseJsonNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/NullableParseJsonNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/OrParseJsonNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/RecordParseJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/ShortParseJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/StringParseJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/TimeParseJsonNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/TimestampParseJsonNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/TryableParseJsonNode.java (70%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/reader/parser/UndefinedParseJsonNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/JsonWriteNodes.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/JsonWriterNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/AnyWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/BinaryWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/BooleanWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/ByteWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/DateWriteJsonNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/DecimalWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/DoubleWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/FloatWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/IntWriteJsonNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/IntervalWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/IterableWriteJsonNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/ListWriteJsonNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/LongWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/NullableWriteJsonNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/OrWriteJsonNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/RecordWriteJsonNode.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/ShortWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/StringWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/TimeWriteJsonNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/TimestampWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/TryableWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/json/writer/internal/UndefinedWriteJsonNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/kryo/KryoFromNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/kryo/KryoWriteNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/BoolParseXmlNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/ByteParseXmlNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/DateParseXmlNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/DecimalParseXmlNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/DoubleParseXmlNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/FloatParseXmlNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/IntParseXmlNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/IterableParseXmlNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/LongParseXmlNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/NullableParseXmlNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/OptionParseXmlTextNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/OrTypeParseXml.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/RawTruffleXmlParser.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/RawTruffleXmlParserFactory.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/RawTruffleXmlParserSettings.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/RecordParseXmlNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/ShortParseXmlNode.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/StringParseXmlNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/TextParseXmlPrimitiveNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/TimeParseXmlNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/TimestampParseXmlNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/TryableParseAttributeXmlNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/TryableParseXmlNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/UndefinedParseXmlNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/XmlParseCollectionNode.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/XmlParseValueNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/XmlReadCollectionNode.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/io/xml/parser/XmlReadValueNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/local/ReadClosureVariableNode.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/local/ReadLocalVariableNode.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/local/ReadParamClosureNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/local/ReadParamNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/local/WriteLocalVariableNode.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/OSRGeneratorNode.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRCollectionFilterBodyNode.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRCollectionMkStringBodyNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRDistinctGetGeneratorNode.java (68%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSREquiJoinNextBodyNode.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRExistsBodyNode.java (73%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRJoinNextBodyNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java (71%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRListFilterBodyNode.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRListFromBodyNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRListParseJsonBodyNode.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRListTransformBodyNode.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRMultiAggregationBodyNode.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSROrderByGetGeneratorNode.java (69%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRSingleAggregationBodyNode.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/bodies/OSRToArrayBodyNode.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/conditions/OSRCollectionFilterConditionNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/conditions/OSRExistsConditionNode.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/conditions/OSRFromBodyConditionNode.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/conditions/OSRHasNextConditionNode.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/ast/osr/conditions/OSRListParseJsonConditionNode.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/boundary/RawTruffleBoundaries.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/data_structures/treemap/TreeMapIterator.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/data_structures/treemap/TreeMapNode.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/data_structures/treemap/TreeMapNodes.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/data_structures/treemap/TreeMapObject.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/data_structures/treemap/TreeMapStatic.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/BreakException.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/RawTruffleInternalErrorException.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/RawTruffleRuntimeException.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/RawTruffleUnexpectedNullException.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/RawTruffleValidationException.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/ReadLinesRawTruffleException.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/binary/BinaryWriterRawTruffleException.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/csv/CsvExpectedNothingException.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/csv/CsvParserRawTruffleException.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/csv/CsvReaderRawTruffleException.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/csv/CsvWriterRawTruffleException.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonExpectedNothingException.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonOrTypeException.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonParserRawTruffleException.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonReaderRawTruffleException.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonRecordFieldNotFoundException.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonUnexpectedTokenException.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/json/JsonWriterRawTruffleException.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/JdbcExceptionHandler.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/MySQLExceptionHandler.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/OracleExceptionHandler.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/rdbms/SqlServerExceptionHandler.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/validation/ValidationErrorMessage.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/validation/ValidationErrorObject.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/validation/ValidationErrorPosition.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/validation/ValidationErrorRange.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/xml/XmlExpectedNothingException.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/xml/XmlOrTypeParserException.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/xml/XmlParserRawTruffleException.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/exceptions/xml/XmlReaderRawTruffleException.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/Closure.java (98%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/Function.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/FunctionExecuteNodes.java (98%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/FunctionRegistryObject.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/Lambda.java (98%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/RawFunctionRegistry.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/function/RecClosure.java (98%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/GeneratorNodes.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/StaticInitializers.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/AbstractGenerator.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java (82%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java (80%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/generator/list/ListGenerator.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/IterableNodes.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/list/ListIterable.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/DistinctCollection.java (88%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/EquiJoinCollection.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/FilterCollection.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/GroupByCollection.java (90%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/JoinCollection.java (85%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/OrderByCollection.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/TakeCollection.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/TransformCollection.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/UnnestCollection.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/operations/ZipCollection.java (84%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/CsvCollection.java (76%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/CsvFromStringCollection.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/EmptyCollection.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/ExpressionCollection.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/IntRangeCollection.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/JdbcQueryCollection.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/JsonReadCollection.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/LongRangeCollection.java (79%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/ReadLinesCollection.java (75%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/TimestampRangeCollection.java (74%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/UnionCollection.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/XmlParseCollection.java (78%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/iterable/sources/XmlReadCollection.java (77%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/kryo/KryoNodes.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/BooleanList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/ByteList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/DoubleList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/FloatList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/IntList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/ListNodes.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/LongList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/ObjectList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/RawArrayList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/ShortList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/list/StringList.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/operators/OperatorNodes.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/or/OrObject.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/BinaryObject.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/DateObject.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/DecimalObject.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/ErrorObject.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/IntervalObject.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/LocationKVSettingHash.java (83%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/LocationObject.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/NullObject.java (94%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/TimeObject.java (86%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/TimestampObject.java (89%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/primitives/TruffleTemporalFormatter.java (92%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/record/DuplicateKeyRecord.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/record/DuplicateKeyRecordNodes.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/record/KeysObject.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/record/PureRecord.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/record/PureRecordNodes.java (96%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/runtime/record/RecordNodes.java (97%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/tryable_nullable/Nullable.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/tryable_nullable/Tryable.java (81%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/tryable_nullable/TryableNullableNodes.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/utils/IOUtils.java (87%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/utils/KryoFootPrint.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/utils/RawTruffleCharStream.java (91%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/utils/RawTruffleStringCharStream.java (93%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/utils/TruffleCharInputStream.java (95%) rename snapi-truffle/src/main/java/{raw/runtime/truffle => com/rawlabs/snapi/truffle/runtime}/utils/TruffleInputStream.java (85%) delete mode 100644 snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SnapiTruffleEmitter.java delete mode 100644 sql-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder rename {sql-client => sql-compiler}/src/main/java/module-info.java (69%) create mode 100644 sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder rename {sql-client => sql-compiler}/src/main/resources/reference.conf (97%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/ErrorCode.scala (92%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/NamedParametersPreparedStatement.scala (98%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/ResultSetIterator.scala (88%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlCodeUtils.scala (87%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlCompilerService.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlCompilerServiceBuilder.scala (78%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlConnection.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlConnectionPool.scala (94%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlIntervals.scala (97%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/SqlTypesUtils.scala (99%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/RawSqlErrorListener.scala (95%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/RawSqlPositions.scala (98%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/RawSqlSyntaxAnalyzer.scala (93%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/RawSqlVisitor.scala (99%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/RawSqlVisitorParseErrors.scala (88%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/SqlNodes.scala (98%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/SqlParam.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/antlr4/SqlParserErrors.scala (91%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/Completion.scala (95%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/DotSearchWithOneItem.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/DotSearchWithTwoItems.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/UserMetadataCache.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/WordSearchWithOneItem.scala (97%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/WordSearchWithThreeItems.scala (96%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/metadata/WordSearchWithTwoItems.scala (97%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/writers/TypedResultSetCsvWriter.scala (92%) rename {sql-client/src/main/scala/raw/client/sql => sql-compiler/src/main/scala/com/rawlabs/sql/compiler}/writers/TypedResultSetJsonWriter.scala (91%) rename {sql-client => sql-compiler}/src/test/resources/example.sql (100%) rename {sql-client/src/test/scala/raw/client/sql => sql-compiler/src/test/scala/com/rawlabs/sql/compiler}/TestNamedParametersStatement.scala (97%) rename {sql-client/src/test/scala/raw/client/sql => sql-compiler/src/test/scala/com/rawlabs/sql/compiler}/TestParseIntervals.scala (93%) rename {sql-client/src/test/scala/raw/client/sql => sql-compiler/src/test/scala/com/rawlabs/sql/compiler}/TestPrintIntervals.scala (92%) rename {sql-client/src/test/scala/raw/client/sql => sql-compiler/src/test/scala/com/rawlabs/sql/compiler}/TestSqlCompilerServiceAirports.scala (98%) rename {sql-client/src/test/scala/raw/client/sql => sql-compiler/src/test/scala/com/rawlabs/sql/compiler}/TestSqlConnectionFailures.scala (90%) rename {sql-client/src/test/scala/raw/client/sql => sql-compiler/src/test/scala/com/rawlabs/sql/compiler}/TestSqlParser.scala (99%) rename sql-parser/{src/main/java/raw/readme.md => README.md} (100%) rename sql-parser/src/main/java/{raw/psql => com/rawlabs/sql/parser}/grammar/PsqlLexer.g4 (100%) rename sql-parser/src/main/java/{raw/psql => com/rawlabs/sql/parser}/grammar/PsqlParser.g4 (100%) rename {utils => utils-core}/src/main/java/module-info.java (90%) rename {utils => utils-core}/src/main/resources/reference.conf (100%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawException.scala (77%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawMBeansManager.scala (98%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawService.scala (85%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawSettings.scala (99%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawUid.scala (93%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawUtils.scala (97%) rename {utils/src/main/scala/raw/utils => utils-core/src/main/scala/com/rawlabs/utils/core}/RawVerboseRunnable.scala (97%) rename {utils/src/test/scala/raw/utils => utils-core/src/test/scala/com/rawlabs/utils/core}/RawMultiplyingTestSuite.scala (98%) rename {utils/src/test/scala/raw/utils => utils-core/src/test/scala/com/rawlabs/utils/core}/RawTestSuite.scala (98%) rename {utils/src/test/scala/raw/utils => utils-core/src/test/scala/com/rawlabs/utils/core}/SettingsTestContext.scala (96%) rename {utils/src/test/scala/raw/utils => utils-core/src/test/scala/com/rawlabs/utils/core}/TrainingWheelsContext.scala (83%) rename {sources => utils-sources}/src/main/java/module-info.java (69%) rename {sources => utils-sources}/src/main/resources/reference.conf (75%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/api/Encodings.scala (98%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/api/Location.scala (91%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/api/LocationException.scala (85%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/api/ByteStreamException.scala (82%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/api/ByteStreamLocation.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/api/DelegatingSeekableInputStream.scala (94%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/api/GenericSkippableInputStream.scala (97%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/api/InputStreamClient.scala (91%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/api/SeekableInputStream.scala (95%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/github/GitHubLocation.scala (88%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/http/HttpByteStreamClient.scala (94%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/http/HttpByteStreamException.scala (80%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/http/HttpByteStreamLocation.scala (92%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/api/BaseFileSystem.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/api/FileSystem.scala (92%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/api/FileSystemExceptions.scala (94%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/api/FileSystemLocation.scala (90%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/api/FileSystemMetadata.scala (93%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/dropbox/BaseDropboxPath.scala (81%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/dropbox/DropboxAccessTokenPath.scala (88%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/dropbox/DropboxFileSystem.scala (94%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/local/LocalFileSystem.scala (95%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/local/LocalPath.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/mock/MockPath.scala (90%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/s3/S3FileSystem.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/s3/S3InputStream.scala (97%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/filesystem/s3/S3Path.scala (87%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/api/JdbcClient.scala (95%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/api/JdbcLocationExceptions.scala (91%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/api/JdbcSchemaLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/api/JdbcServerLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/api/JdbcTableLocation.scala (88%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/mysql/MySqlClient.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/mysql/MySqlSchemaLocation.scala (88%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/mysql/MySqlServerLocation.scala (86%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/mysql/MySqlTableLocation.scala (86%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/oracle/OracleClient.scala (98%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/oracle/OracleSchemaLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/oracle/OracleServerLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/oracle/OracleTableLocation.scala (87%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/pgsql/PostgresqlClient.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/pgsql/PostgresqlServerLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/pgsql/PostgresqlTableLocation.scala (87%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/snowflake/SnowflakeClient.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala (90%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/snowflake/SnowflakeServerLocation.scala (92%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/snowflake/SnowflakeTableLocation.scala (91%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlite/SqliteClient.scala (94%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlite/SqliteSchemaLocation.scala (85%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlite/SqliteServerLocation.scala (83%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlite/SqliteTableLocation.scala (83%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlserver/SqlServerClient.scala (96%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala (88%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlserver/SqlServerServerLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/sqlserver/SqlServerTableLocation.scala (87%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/teradata/TeradataClient.scala (97%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/teradata/TeradataSchemaLocation.scala (89%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/teradata/TeradataServerLocation.scala (87%) rename {sources/src/main/scala/raw => utils-sources/src/main/scala/com/rawlabs/utils}/sources/jdbc/teradata/TeradataTableLocation.scala (88%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/bytestream/api/TestGenericSkippableInputStream.scala (96%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/bytestream/http/HttpLocationsTestContext.scala (93%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/bytestream/http/TestHttpServer.scala (97%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/api/TestFileSystems.scala (98%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/dropbox/TestDropboxFileSystem.scala (88%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala (89%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/local/TestLocalFileSystem.scala (83%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/s3/TestLargeDirectory.scala (92%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/s3/TestRootS3FileSystem.scala (94%) rename {sources/src/test/scala/raw => utils-sources/src/test/scala/com/rawlabs/utils}/sources/filesystem/s3/TestS3FileSystem.scala (94%) delete mode 100644 utils/src/test/java/raw/testing/tags/Tier1.java delete mode 100644 utils/src/test/java/raw/testing/tags/TruffleTests.java delete mode 100644 utils/src/test/scala/raw/utils/Tags.scala diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8856cb35e..5c319de45 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -6,14 +6,14 @@ on: - build.sbt - project/** - deps/** - - utils/** - - client/** - - snapi-client/** + - utils-core/** + - utils-sources/** + - compiler/** - snapi-frontend/** - - parsers/** - snapi-truffle/** - - python-client/** - - sql-client/** + - snapi-compiler/** + - python-compiler/** + - sql-compiler/** - .github/workflows/ci.yaml workflow_dispatch: @@ -45,10 +45,11 @@ jobs: fail-fast: false matrix: component: + - utils-sources - snapi-frontend - - snapi-client - - sql-client - - python-client + - snapi-compiler + - sql-compiler + - python-compiler runs-on: self-hosted steps: - uses: actions/checkout@v4 diff --git a/build.sbt b/build.sbt index e879371d7..a5772e3fc 100644 --- a/build.sbt +++ b/build.sbt @@ -36,16 +36,17 @@ writeVersionToFile := { lazy val root = (project in file(".")) .aggregate( - protocol, - utils, - sources, - client, + protocolCompiler, + protocolRaw, + utilsCore, + utilsSources, + compiler, snapiParser, snapiFrontend, snapiTruffle, - snapiClient, + snapiCompiler, sqlParser, - sqlClient + sqlCompiler ) .settings( commonSettings, @@ -57,7 +58,7 @@ lazy val root = (project in file(".")) publishLocal / skip := true ) -lazy val utils = (project in file("utils")) +lazy val utilsCore = (project in file("utils-core")) .settings( commonSettings, scalaCompileSettings, @@ -77,9 +78,9 @@ lazy val utils = (project in file("utils")) jacksonDeps ) -lazy val sources = (project in file("sources")) +lazy val utilsSources = (project in file("utils-sources")) .dependsOn( - utils % "compile->compile;test->test" + utilsCore % "compile->compile;test->test" ) .settings( commonSettings, @@ -102,7 +103,7 @@ lazy val sources = (project in file("sources")) ) ) -lazy val protocol = (project in file("protocol")) +lazy val protocolRaw = (project in file("protocol-raw")) .enablePlugins(ProtobufPlugin) .settings( commonSettings, @@ -113,10 +114,21 @@ lazy val protocol = (project in file("protocol")) Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value ) -lazy val client = (project in file("client")) +lazy val protocolCompiler = (project in file("protocol-compiler")) + .enablePlugins(ProtobufPlugin) + .settings( + commonSettings, + commonCompileSettings, + testSettings, + ProtobufConfig / version := "3.25.4", + // Include the protobuf files in the JAR + Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value + ) + +lazy val compiler = (project in file("compiler")) .dependsOn( - utils % "compile->compile;test->test", - protocol % "compile->compile;test->test" + utilsCore % "compile->compile;test->test", + protocolCompiler % "compile->compile;test->test" ) .settings( commonSettings, @@ -133,9 +145,9 @@ lazy val snapiParser = (project in file("snapi-parser")) javaSrcBasePath := s"${baseDirectory.value}/src/main/java", parserDefinitions := List( ( - s"${javaSrcBasePath.value}/raw/compiler/rql2/generated", - "raw.compiler.rql2.generated", - s"${javaSrcBasePath.value}/raw/snapi/grammar", + s"${javaSrcBasePath.value}/com/rawlabs/snapi/parser/generated", + "com.rawlabs.snapi.parser.generated", + s"${javaSrcBasePath.value}/com/rawlabs/snapi/parser/grammar", "Snapi" ) ), @@ -148,9 +160,9 @@ lazy val snapiParser = (project in file("snapi-parser")) lazy val snapiFrontend = (project in file("snapi-frontend")) .dependsOn( - utils % "compile->compile;test->test", - client % "compile->compile;test->test", - sources % "compile->compile;test->test", + utilsCore % "compile->compile;test->test", + compiler % "compile->compile;test->test", + utilsSources % "compile->compile;test->test", snapiParser % "compile->compile;test->test" ) .settings( @@ -184,7 +196,7 @@ val annotationProcessors = Seq( lazy val snapiTruffle = (project in file("snapi-truffle")) .dependsOn( - utils % "compile->compile;test->test", + utilsCore % "compile->compile;test->test", snapiFrontend % "compile->compile;test->test" ) .enablePlugins(JavaAnnotationProcessorPlugin) @@ -245,9 +257,9 @@ lazy val snapiTruffle = (project in file("snapi-truffle")) publishSigned := (publishSigned dependsOn runJavaAnnotationProcessor).value ) -lazy val snapiClient = (project in file("snapi-client")) +lazy val snapiCompiler = (project in file("snapi-compiler")) .dependsOn( - client % "compile->compile;test->test", + compiler % "compile->compile;test->test", snapiFrontend % "compile->compile;test->test", snapiTruffle % "compile->compile;test->test" ) @@ -265,9 +277,9 @@ lazy val sqlParser = (project in file("sql-parser")) javaSrcBasePath := s"${baseDirectory.value}/src/main/java", parserDefinitions := List( ( - s"${javaSrcBasePath.value}/raw/client/sql/generated", - "raw.client.sql.generated", - s"${javaSrcBasePath.value}/raw/psql/grammar", + s"${javaSrcBasePath.value}/com/rawlabs/sql/parser/generated", + "com.rawlabs.sql.parser.generated", + s"${javaSrcBasePath.value}/com/rawlabs/sql/parser/grammar", "Psql" ) ), @@ -278,9 +290,9 @@ lazy val sqlParser = (project in file("sql-parser")) ) ) -lazy val sqlClient = (project in file("sql-client")) +lazy val sqlCompiler = (project in file("sql-compiler")) .dependsOn( - client % "compile->compile;test->test", + compiler % "compile->compile;test->test", sqlParser % "compile->compile;test->test" ) .settings( @@ -296,9 +308,9 @@ lazy val sqlClient = (project in file("sql-client")) ) ) -lazy val pythonClient = (project in file("python-client")) +lazy val pythonCompiler = (project in file("python-compiler")) .dependsOn( - client % "compile->compile;test->test" + compiler % "compile->compile;test->test" ) .settings( commonSettings, diff --git a/client/src/main/java/module-info.java b/compiler/src/main/java/module-info.java similarity index 71% rename from client/src/main/java/module-info.java rename to compiler/src/main/java/module-info.java index f7f00664a..a3de8c2fc 100644 --- a/client/src/main/java/module-info.java +++ b/compiler/src/main/java/module-info.java @@ -10,7 +10,9 @@ * licenses/APL.txt. */ -module raw.client { +import com.rawlabs.compiler.CompilerServiceBuilder; + +module raw.compiler { requires scala.library; requires org.slf4j; requires org.graalvm.polyglot; @@ -20,15 +22,15 @@ requires com.fasterxml.jackson.scala; requires com.fasterxml.jackson.datatype.jsr310; requires com.fasterxml.jackson.datatype.jdk8; - requires raw.utils; - requires raw.protocol; + requires raw.utils.core; + requires raw.protocol.compiler; - exports raw.client.api; - exports raw.client.writers; - exports raw.client.utils; + exports com.rawlabs.compiler; + exports com.rawlabs.compiler.writers; + exports com.rawlabs.compiler.utils; - opens raw.client.api to + opens com.rawlabs.compiler to com.fasterxml.jackson.databind; - uses raw.client.api.CompilerServiceBuilder; + uses CompilerServiceBuilder; } diff --git a/client/src/main/scala/raw/client/api/CompilerService.scala b/compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala similarity index 98% rename from client/src/main/scala/raw/client/api/CompilerService.scala rename to compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala index 9956d7f3d..f5343bf0c 100644 --- a/client/src/main/scala/raw/client/api/CompilerService.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} import org.graalvm.polyglot.Engine -import raw.utils.{RawException, RawService, RawSettings} import java.io.OutputStream import scala.collection.mutable import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} +import com.rawlabs.utils.core.{RawException, RawService, RawSettings} // Exception that wraps the underlying error so that it includes the extra debug info. final class CompilerServiceException( diff --git a/client/src/main/scala/raw/client/api/CompilerServiceBuilder.scala b/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceBuilder.scala similarity index 88% rename from client/src/main/scala/raw/client/api/CompilerServiceBuilder.scala rename to compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceBuilder.scala index aabd61cc2..8080e50e2 100644 --- a/client/src/main/scala/raw/client/api/CompilerServiceBuilder.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceBuilder.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler -import raw.utils.RawSettings +import com.rawlabs.utils.core.RawSettings trait CompilerServiceBuilder { diff --git a/client/src/main/scala/raw/client/api/CompilerServiceProvider.scala b/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala similarity index 93% rename from client/src/main/scala/raw/client/api/CompilerServiceProvider.scala rename to compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala index e56ff2c57..1a670e1e2 100644 --- a/client/src/main/scala/raw/client/api/CompilerServiceProvider.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler -import raw.utils.RawSettings +import com.rawlabs.utils.core.RawSettings import java.util.ServiceLoader import scala.collection.JavaConverters._ @@ -36,7 +36,7 @@ object CompilerServiceProvider { } // This method is only used by the test framework. - private[raw] def set(language: Set[String], instance: CompilerService): Unit = { + def set(language: Set[String], instance: CompilerService): Unit = { instanceLock.synchronized { if (instance == null) { // Stop and remove entries that match the `language`, regardless the class loader. diff --git a/client/src/main/scala/raw/client/api/Docs.scala b/compiler/src/main/scala/com/rawlabs/compiler/Docs.scala similarity index 99% rename from client/src/main/scala/raw/client/api/Docs.scala rename to compiler/src/main/scala/com/rawlabs/compiler/Docs.scala index 1285573b5..8189e7cc6 100644 --- a/client/src/main/scala/raw/client/api/Docs.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/Docs.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler /** * Package documentation. diff --git a/client/src/main/scala/raw/client/api/Entrypoint.scala b/compiler/src/main/scala/com/rawlabs/compiler/Entrypoint.scala similarity index 94% rename from client/src/main/scala/raw/client/api/Entrypoint.scala rename to compiler/src/main/scala/com/rawlabs/compiler/Entrypoint.scala index eb38bbfab..e6ac8a108 100644 --- a/client/src/main/scala/raw/client/api/Entrypoint.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/Entrypoint.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler // TODO (msb): Add methods for execution so that same interface is respected by all. trait Entrypoint { diff --git a/client/src/main/scala/raw/client/api/Errors.scala b/compiler/src/main/scala/com/rawlabs/compiler/Errors.scala similarity index 97% rename from client/src/main/scala/raw/client/api/Errors.scala rename to compiler/src/main/scala/com/rawlabs/compiler/Errors.scala index 382db1649..a78168e37 100644 --- a/client/src/main/scala/raw/client/api/Errors.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/Errors.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} -import raw.utils.RawException import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} +import com.rawlabs.utils.core.RawException /** * Used for errors that are found during semantic analysis. diff --git a/client/src/main/scala/raw/client/api/ProgramDescription.scala b/compiler/src/main/scala/com/rawlabs/compiler/ProgramDescription.scala similarity index 96% rename from client/src/main/scala/raw/client/api/ProgramDescription.scala rename to compiler/src/main/scala/com/rawlabs/compiler/ProgramDescription.scala index 6cae8018d..342c3e12f 100644 --- a/client/src/main/scala/raw/client/api/ProgramDescription.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/ProgramDescription.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler final case class ProgramDescription( decls: Map[String, List[DeclDescription]], diff --git a/client/src/main/scala/raw/client/api/ProgramEnvironment.scala b/compiler/src/main/scala/com/rawlabs/compiler/ProgramEnvironment.scala similarity index 95% rename from client/src/main/scala/raw/client/api/ProgramEnvironment.scala rename to compiler/src/main/scala/com/rawlabs/compiler/ProgramEnvironment.scala index 23384ec61..f50de2385 100644 --- a/client/src/main/scala/raw/client/api/ProgramEnvironment.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/ProgramEnvironment.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler import com.fasterxml.jackson.core.{JsonGenerator, JsonParser} import com.fasterxml.jackson.databind.module.SimpleModule @@ -24,9 +24,8 @@ import com.fasterxml.jackson.databind.{ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule} - -import raw.utils.RawUid -import raw.protocol.LocationConfig +import com.rawlabs.protocol.compiler.LocationConfig +import com.rawlabs.utils.core.RawUid final case class ProgramEnvironment( uid: RawUid, diff --git a/client/src/main/scala/raw/client/api/RawTypes.scala b/compiler/src/main/scala/com/rawlabs/compiler/RawTypes.scala similarity index 99% rename from client/src/main/scala/raw/client/api/RawTypes.scala rename to compiler/src/main/scala/com/rawlabs/compiler/RawTypes.scala index 74b8edf3a..3b18b4f17 100644 --- a/client/src/main/scala/raw/client/api/RawTypes.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/RawTypes.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} diff --git a/client/src/main/scala/raw/client/api/RawValues.scala b/compiler/src/main/scala/com/rawlabs/compiler/RawValues.scala similarity index 98% rename from client/src/main/scala/raw/client/api/RawValues.scala rename to compiler/src/main/scala/com/rawlabs/compiler/RawValues.scala index 71a49fccd..122ccdb0c 100644 --- a/client/src/main/scala/raw/client/api/RawValues.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/RawValues.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.api +package com.rawlabs.compiler import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} diff --git a/client/src/main/scala/raw/client/utils/RecordFieldsNaming.scala b/compiler/src/main/scala/com/rawlabs/compiler/utils/RecordFieldsNaming.scala similarity index 97% rename from client/src/main/scala/raw/client/utils/RecordFieldsNaming.scala rename to compiler/src/main/scala/com/rawlabs/compiler/utils/RecordFieldsNaming.scala index b91a10b5a..b055d5bf5 100644 --- a/client/src/main/scala/raw/client/utils/RecordFieldsNaming.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/utils/RecordFieldsNaming.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.utils +package com.rawlabs.compiler.utils import scala.collection.mutable diff --git a/client/src/main/scala/raw/client/writers/PolyglotBinaryWriter.scala b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotBinaryWriter.scala similarity index 96% rename from client/src/main/scala/raw/client/writers/PolyglotBinaryWriter.scala rename to compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotBinaryWriter.scala index ce93c2762..5cd444d08 100644 --- a/client/src/main/scala/raw/client/writers/PolyglotBinaryWriter.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotBinaryWriter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.writers +package com.rawlabs.compiler.writers import org.graalvm.polyglot.Value diff --git a/client/src/main/scala/raw/client/writers/PolyglotCsvWriter.scala b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotCsvWriter.scala similarity index 99% rename from client/src/main/scala/raw/client/writers/PolyglotCsvWriter.scala rename to compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotCsvWriter.scala index e92ada3e4..ac7f249a4 100644 --- a/client/src/main/scala/raw/client/writers/PolyglotCsvWriter.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotCsvWriter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.writers +package com.rawlabs.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonGenerator, JsonParser} import com.fasterxml.jackson.dataformat.csv.CsvFactory diff --git a/client/src/main/scala/raw/client/writers/PolyglotJsonWriter.scala b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotJsonWriter.scala similarity index 99% rename from client/src/main/scala/raw/client/writers/PolyglotJsonWriter.scala rename to compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotJsonWriter.scala index d19580f7e..7c6555cc2 100644 --- a/client/src/main/scala/raw/client/writers/PolyglotJsonWriter.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotJsonWriter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.writers +package com.rawlabs.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonGenerator, JsonParser} import org.graalvm.polyglot.{PolyglotException, Value} diff --git a/client/src/main/scala/raw/client/writers/PolyglotTextWriter.scala b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotTextWriter.scala similarity index 95% rename from client/src/main/scala/raw/client/writers/PolyglotTextWriter.scala rename to compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotTextWriter.scala index 746d2b9ff..b0199818b 100644 --- a/client/src/main/scala/raw/client/writers/PolyglotTextWriter.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/writers/PolyglotTextWriter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.writers +package com.rawlabs.compiler.writers import org.graalvm.polyglot.Value diff --git a/client/src/main/scala/raw/client/writers/TypedPolyglotCsvWriter.scala b/compiler/src/main/scala/com/rawlabs/compiler/writers/TypedPolyglotCsvWriter.scala similarity index 94% rename from client/src/main/scala/raw/client/writers/TypedPolyglotCsvWriter.scala rename to compiler/src/main/scala/com/rawlabs/compiler/writers/TypedPolyglotCsvWriter.scala index 805c1c0e6..e4a4fb8b0 100644 --- a/client/src/main/scala/raw/client/writers/TypedPolyglotCsvWriter.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/writers/TypedPolyglotCsvWriter.scala @@ -10,14 +10,33 @@ * licenses/APL.txt. */ -package raw.client.writers +package com.rawlabs.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonParser} import com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING import com.fasterxml.jackson.dataformat.csv.{CsvFactory, CsvSchema} +import com.rawlabs.compiler.{ + RawBinaryType, + RawBoolType, + RawByteType, + RawDateType, + RawDecimalType, + RawDoubleType, + RawFloatType, + RawIntType, + RawIntervalType, + RawIterableType, + RawListType, + RawLongType, + RawRecordType, + RawShortType, + RawStringType, + RawTimeType, + RawTimestampType, + RawType +} +import com.rawlabs.compiler.utils.RecordFieldsNaming import org.graalvm.polyglot.Value -import raw.client.api._ -import raw.client.utils.RecordFieldsNaming import java.io.{Closeable, IOException, OutputStream} import java.time.format.DateTimeFormatter diff --git a/client/src/main/scala/raw/client/writers/TypedPolyglotJsonWriter.scala b/compiler/src/main/scala/com/rawlabs/compiler/writers/TypedPolyglotJsonWriter.scala similarity index 93% rename from client/src/main/scala/raw/client/writers/TypedPolyglotJsonWriter.scala rename to compiler/src/main/scala/com/rawlabs/compiler/writers/TypedPolyglotJsonWriter.scala index 3ecf0a2f7..a104b7cd7 100644 --- a/client/src/main/scala/raw/client/writers/TypedPolyglotJsonWriter.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/writers/TypedPolyglotJsonWriter.scala @@ -10,12 +10,32 @@ * licenses/APL.txt. */ -package raw.client.writers +package com.rawlabs.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonParser} +import com.rawlabs.compiler.{ + RawBinaryType, + RawBoolType, + RawByteType, + RawDateType, + RawDecimalType, + RawDoubleType, + RawFloatType, + RawIntType, + RawIntervalType, + RawIterableType, + RawListType, + RawLongType, + RawOrType, + RawRecordType, + RawShortType, + RawStringType, + RawTimeType, + RawTimestampType, + RawType +} +import com.rawlabs.compiler.utils.RecordFieldsNaming import org.graalvm.polyglot.Value -import raw.client.api._ -import raw.client.utils.RecordFieldsNaming import java.io.{Closeable, IOException, OutputStream} import java.time.format.DateTimeFormatter diff --git a/launcher/src/main/java/module-info.java b/launcher/src/main/java/module-info.java index f8c10ca71..ee277e942 100644 --- a/launcher/src/main/java/module-info.java +++ b/launcher/src/main/java/module-info.java @@ -12,15 +12,15 @@ module raw.cli { requires org.graalvm.polyglot; - requires raw.client; - requires raw.utils; + requires raw.compiler; + requires raw.utils.core; requires typesafe.config; requires scala.library; requires org.slf4j; requires org.jline.terminal; requires org.jline.reader; // requires raw.creds.api; -// requires raw.utils; +// requires raw.utils.core; // requires scala.library; // requires com.typesafe.scalalogging_2.12; exports raw.cli; diff --git a/launcher/src/main/java/raw/cli/MultilineParser.java b/launcher/src/main/java/raw/cli/MultilineParser.java index fe7d52101..5a8c31cac 100644 --- a/launcher/src/main/java/raw/cli/MultilineParser.java +++ b/launcher/src/main/java/raw/cli/MultilineParser.java @@ -14,7 +14,7 @@ // //import org.jline.reader.ParsedLine; //import org.jline.reader.impl.DefaultParser; -//import raw.client.api.CompilerService; +//import com.rawlabs.compiler.CompilerService; // ///** // * A parser that allows for multi-line input. diff --git a/launcher/src/main/java/raw/cli/RawLauncher.java b/launcher/src/main/java/raw/cli/RawLauncher.java index d25721036..f1fd3b8de 100644 --- a/launcher/src/main/java/raw/cli/RawLauncher.java +++ b/launcher/src/main/java/raw/cli/RawLauncher.java @@ -15,10 +15,10 @@ import com.typesafe.config.ConfigFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import raw.client.api.*; -import raw.utils.RawUid; -import raw.utils.RawException; -import raw.utils.RawSettings; +import com.rawlabs.compiler.*; +import com.rawlabs.utils.core.RawUid; +import com.rawlabs.utils.core.RawException; +import com.rawlabs.utils.core.RawSettings; import scala.Option; import scala.collection.JavaConverters; import scala.collection.Seq; diff --git a/launcher/src/main/resources/reference.conf b/launcher/src/main/resources/reference.conf index 3393369e6..e69de29bb 100644 --- a/launcher/src/main/resources/reference.conf +++ b/launcher/src/main/resources/reference.conf @@ -1 +0,0 @@ -raw.creds.impl = "local" \ No newline at end of file diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index 8f091b384..4218ae2a8 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -9,7 +9,7 @@ import com.jsuereth.sbtpgp.PgpKeys.{publishSigned} object BuildSettings { lazy val commonSettings = Seq( - name := "raw-" + baseDirectory.value.getName, + name := baseDirectory.value.getName, homepage := Some(url("https://www.raw-labs.com/")), organization := "com.raw-labs", organizationName := "RAW Labs SA", diff --git a/protocol-compiler/src/main/java/com/rawlabs/protocol/compiler/Placeholder.java b/protocol-compiler/src/main/java/com/rawlabs/protocol/compiler/Placeholder.java new file mode 100644 index 000000000..364059ad1 --- /dev/null +++ b/protocol-compiler/src/main/java/com/rawlabs/protocol/compiler/Placeholder.java @@ -0,0 +1,17 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.protocol.compiler; + +class Placeholder { + // Placeholder class to allow the module-info.java file to be compiled +} diff --git a/utils/src/main/scala/raw/utils/RawServiceException.scala b/protocol-compiler/src/main/java/module-info.java similarity index 68% rename from utils/src/main/scala/raw/utils/RawServiceException.scala rename to protocol-compiler/src/main/java/module-info.java index 4cff6d539..921c1af34 100644 --- a/utils/src/main/scala/raw/utils/RawServiceException.scala +++ b/protocol-compiler/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 RAW Labs S.A. + * Copyright 2024 RAW Labs S.A. * * Use of this software is governed by the Business Source License * included in the file licenses/BSL.txt. @@ -10,6 +10,8 @@ * licenses/APL.txt. */ -package raw.utils +module raw.protocol.compiler { + requires com.google.protobuf; -class RawServiceException(message: String, cause: Throwable = null) extends RawException(message, cause) + exports com.rawlabs.protocol.compiler; +} diff --git a/protocol/src/main/protobuf/raw/protocol/protocol.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/protocol.proto similarity index 97% rename from protocol/src/main/protobuf/raw/protocol/protocol.proto rename to protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/protocol.proto index 486a7ea2e..751a42359 100644 --- a/protocol/src/main/protobuf/raw/protocol/protocol.proto +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/protocol.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -option java_package = "raw.protocol"; +option java_package = "com.rawlabs.protocol.compiler"; option java_multiple_files = true; -package raw.protocol; +package com.rawlabs.protocol.compiler; message LocationConfig { oneof config { diff --git a/protocol/src/main/java/raw/protocol/Placeholder.java b/protocol-raw/src/main/java/com/rawlabs/protocol/raw/Placeholder.java similarity index 93% rename from protocol/src/main/java/raw/protocol/Placeholder.java rename to protocol-raw/src/main/java/com/rawlabs/protocol/raw/Placeholder.java index c91fe2176..dcc09a346 100644 --- a/protocol/src/main/java/raw/protocol/Placeholder.java +++ b/protocol-raw/src/main/java/com/rawlabs/protocol/raw/Placeholder.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.protocol; +package com.rawlabs.protocol.raw; class Placeholder { // Placeholder class to allow the module-info.java file to be compiled diff --git a/protocol/src/main/java/module-info.java b/protocol-raw/src/main/java/module-info.java similarity index 86% rename from protocol/src/main/java/module-info.java rename to protocol-raw/src/main/java/module-info.java index 912b1664f..00af9921d 100644 --- a/protocol/src/main/java/module-info.java +++ b/protocol-raw/src/main/java/module-info.java @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -module raw.protocol { +module raw.protocol.raw { requires com.google.protobuf; - exports raw.protocol; + exports com.rawlabs.protocol.raw; } diff --git a/protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/types.proto b/protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/types.proto new file mode 100644 index 000000000..0ade48641 --- /dev/null +++ b/protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/types.proto @@ -0,0 +1,149 @@ +/** + * Copyright 2024 RAW Labs S.A. + * All rights reserved. + * + * This source code is the property of RAW Labs S.A. It contains + * proprietary and confidential information that is protected by applicable + * intellectual property and other laws. Unauthorized use, reproduction, + * or distribution of this code, or any portion of it, may result in severe + * civil and criminal penalties and will be prosecuted to the maximum + * extent possible under the law. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.raw"; +option java_multiple_files = true; + +package com.rawlabs.protocol.raw; + +message Type { + oneof type { + AnyType any = 1; + UndefinedType undefined = 2; + ByteType byte = 3; + ShortType short = 4; + IntType int = 5; + LongType long = 6; + FloatType float = 7; + DoubleType double = 8; + DecimalType decimal = 9; + BoolType bool = 10; + StringType string = 11; + BinaryType binary = 12; + DateType date = 13; + TimeType time = 14; + TimestampType timestamp = 15; + IntervalType interval = 16; + RecordType record = 17; + ListType list = 18; + IterableType iterable = 19; + OrType or = 20; + } +} + +message AnyType {} + +message UndefinedType { + bool nullable = 1; + bool triable = 2; +} + +message ByteType { + bool nullable = 1; + bool triable = 2; +} + +message ShortType { + bool nullable = 1; + bool triable = 2; +} + +message IntType { + bool nullable = 1; + bool triable = 2; +} + +message LongType { + bool nullable = 1; + bool triable = 2; +} + +message FloatType { + bool nullable = 1; + bool triable = 2; +} + +message DoubleType { + bool nullable = 1; + bool triable = 2; +} + +message DecimalType { + bool nullable = 1; + bool triable = 2; +} + +message BoolType { + bool nullable = 1; + bool triable = 2; +} + +message StringType { + bool nullable = 1; + bool triable = 2; +} + +message BinaryType { + bool nullable = 1; + bool triable = 2; +} + +message DateType { + bool nullable = 1; + bool triable = 2; +} + +message TimeType { + bool nullable = 1; + bool triable = 2; +} + +message TimestampType { + bool nullable = 1; + bool triable = 2; +} + +message IntervalType { + bool nullable = 1; + bool triable = 2; +} + +message RecordType { + repeated AttrType atts = 1; + bool nullable = 2; + bool triable = 3; +} + +message AttrType { + string idn = 1; + Type tipe = 2; +} + +message ListType { + Type innerType = 1; + bool nullable = 2; + bool triable = 3; +} + +message IterableType { + Type innerType = 1; + bool nullable = 2; + bool triable = 3; +} + +message OrType { + repeated Type ors = 1; + bool nullable = 2; + bool triable = 3; +} diff --git a/protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/values.proto b/protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/values.proto new file mode 100644 index 000000000..b07b7640f --- /dev/null +++ b/protocol-raw/src/main/protobuf/com/rawlabs/protocol/raw/values.proto @@ -0,0 +1,114 @@ +/** + * Copyright 2024 RAW Labs S.A. + * All rights reserved. + * + * This source code is the property of RAW Labs S.A. It contains + * proprietary and confidential information that is protected by applicable + * intellectual property and other laws. Unauthorized use, reproduction, + * or distribution of this code, or any portion of it, may result in severe + * civil and criminal penalties and will be prosecuted to the maximum + * extent possible under the law. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.raw"; +option java_multiple_files = true; + +package com.rawlabs.protocol.raw; + +message Value { + oneof value { + ValueNull null = 2; + ValueByte byte = 4; + ValueShort short = 5; + ValueInt int = 6; + ValueLong long = 7; + ValueFloat float = 8; + ValueDouble double = 9; + ValueDecimal decimal = 10; + ValueBool bool = 11; + ValueString string = 12; + ValueBinary binary = 13; + ValueDate date = 15; + ValueTime time = 16; + ValueTimestamp timestamp = 17; + ValueInterval interval = 18; + } +} + +message ValueNull {} + +message ValueByte { + int32 v = 1; +} + +message ValueShort { + int32 v = 1; +} + +message ValueInt { + int32 v = 1; +} + +message ValueLong { + int64 v = 1; +} + +message ValueFloat { + float v = 1; +} + +message ValueDouble { + double v = 1; +} + +message ValueDecimal { + string v = 1; +} + +message ValueBool { + bool v = 1; +} + +message ValueString { + string v = 1; +} + +message ValueBinary { + bytes v = 1; +} + +message ValueDate { + int32 year = 1; + int32 month = 2; + int32 day = 3; +} + +message ValueTime { + int32 hour = 1; + int32 minute = 2; + int32 second = 3; + int32 nano = 4; +} + +message ValueTimestamp { + int32 year = 1; + int32 month = 2; + int32 day = 3; + int32 hour = 4; + int32 minute = 5; + int32 second = 6; + int32 nano = 7; +} + +message ValueInterval { + int32 years = 1; + int32 months = 2; + int32 weeks = 3; + int32 days = 4; + int32 hours = 5; + int32 minutes = 6; + int32 seconds = 7; + int32 millis = 8; +} diff --git a/python-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder b/python-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder deleted file mode 100644 index fc1c4d6ff..000000000 --- a/python-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder +++ /dev/null @@ -1 +0,0 @@ -raw.client.python.PythonCompilerServiceBuilder \ No newline at end of file diff --git a/python-client/.sbtopts b/python-compiler/.sbtopts similarity index 100% rename from python-client/.sbtopts rename to python-compiler/.sbtopts diff --git a/python-client/.scalafmt.conf b/python-compiler/.scalafmt.conf similarity index 100% rename from python-client/.scalafmt.conf rename to python-compiler/.scalafmt.conf diff --git a/python-client/build.sh b/python-compiler/build.sh similarity index 100% rename from python-client/build.sh rename to python-compiler/build.sh diff --git a/python-client/project/Dependencies.scala b/python-compiler/project/Dependencies.scala similarity index 100% rename from python-client/project/Dependencies.scala rename to python-compiler/project/Dependencies.scala diff --git a/python-client/project/build.properties b/python-compiler/project/build.properties similarity index 100% rename from python-client/project/build.properties rename to python-compiler/project/build.properties diff --git a/python-client/project/plugins.sbt b/python-compiler/project/plugins.sbt similarity index 100% rename from python-client/project/plugins.sbt rename to python-compiler/project/plugins.sbt diff --git a/python-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder b/python-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder new file mode 100644 index 000000000..5dd951dfa --- /dev/null +++ b/python-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder @@ -0,0 +1 @@ +com.rawlabs.python.compiler.PythonCompilerServiceBuilder \ No newline at end of file diff --git a/python-client/src/main/scala/raw/client/python/PythonCompilerService.scala b/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala similarity index 92% rename from python-client/src/main/scala/raw/client/python/PythonCompilerService.scala rename to python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala index 0d963f857..92e4b14f2 100644 --- a/python-client/src/main/scala/raw/client/python/PythonCompilerService.scala +++ b/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.client.python +package com.rawlabs.python.compiler +import com.rawlabs.compiler.{AutoCompleteResponse, CompilerService, CompilerServiceException, ExecutionResponse, ExecutionRuntimeFailure, ExecutionSuccess, FormatCodeResponse, GetProgramDescriptionResponse, GoToDefinitionResponse, HoverResponse, Pos, ProgramEnvironment, RawBool, RawByte, RawDate, RawDecimal, RawDouble, RawFloat, RawInt, RawInterval, RawLong, RawNull, RawShort, RawString, RawTime, RawTimestamp, RawValue, RenameResponse, ValidateResponse} +import com.rawlabs.compiler.writers.{PolyglotBinaryWriter, PolyglotCsvWriter, PolyglotJsonWriter, PolyglotTextWriter} +import com.rawlabs.utils.core.{RawSettings, RawUtils} import org.graalvm.polyglot.{Context, Engine, PolyglotAccess, PolyglotException, Source, Value} -import raw.client.api._ -import raw.client.writers.{PolyglotBinaryWriter, PolyglotCsvWriter, PolyglotJsonWriter, PolyglotTextWriter} -import raw.utils.{RawSettings, RawUtils} import java.io.{IOException, OutputStream} @@ -92,7 +92,7 @@ class PythonCompilerService(engineDefinition: (Engine, Boolean))(implicit protec // } // } catch { // case ex: CompilerParserException => GetProgramDescriptionFailure( -// List(ErrorMessage(ex.getMessage, List(raw.client.api.ErrorRange(ex.position, ex.position)))) +// List(ErrorMessage(ex.getMessage, List(com.rawlabs.compiler.ErrorRange(ex.position, ex.position)))) // ) // case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) // } diff --git a/python-client/src/main/scala/raw/client/python/PythonCompilerServiceBuilder.scala b/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerServiceBuilder.scala similarity index 77% rename from python-client/src/main/scala/raw/client/python/PythonCompilerServiceBuilder.scala rename to python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerServiceBuilder.scala index d003a9230..b6ea8ae01 100644 --- a/python-client/src/main/scala/raw/client/python/PythonCompilerServiceBuilder.scala +++ b/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerServiceBuilder.scala @@ -10,10 +10,11 @@ * licenses/APL.txt. */ -package raw.client.python +package com.rawlabs.python.compiler -import raw.client.api.{CompilerService, CompilerServiceBuilder} -import raw.utils.RawSettings +import com.rawlabs.compiler.CompilerServiceBuilder +import com.rawlabs.compiler.CompilerService +import com.rawlabs.utils.core.RawSettings class PythonCompilerServiceBuilder extends CompilerServiceBuilder { override def language: Set[String] = Set("python") diff --git a/python-client/src/test/scala/raw/client/python/TestPythonCompilerService.scala b/python-compiler/src/test/scala/com/rawlabs/python/compiler/TestPythonCompilerService.scala similarity index 90% rename from python-client/src/test/scala/raw/client/python/TestPythonCompilerService.scala rename to python-compiler/src/test/scala/com/rawlabs/python/compiler/TestPythonCompilerService.scala index 03f8328ce..a53b8b765 100644 --- a/python-client/src/test/scala/raw/client/python/TestPythonCompilerService.scala +++ b/python-compiler/src/test/scala/com/rawlabs/python/compiler/TestPythonCompilerService.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.client.python +package com.rawlabs.python.compiler -import raw.client.api.{CompilerService, ExecutionSuccess, ProgramEnvironment, RawInt} -import raw.utils.{RawTestSuite, RawUid, SettingsTestContext, TrainingWheelsContext} +import com.rawlabs.compiler.{CompilerService, ExecutionSuccess, ProgramEnvironment, RawInt} +import com.rawlabs.utils.core.{RawTestSuite, RawUid, SettingsTestContext, TrainingWheelsContext} import java.io.ByteArrayOutputStream diff --git a/snapi-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder b/snapi-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder deleted file mode 100644 index accb74f52..000000000 --- a/snapi-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder +++ /dev/null @@ -1 +0,0 @@ -raw.client.rql2.truffle.Rql2TruffleCompilerServiceBuilder \ No newline at end of file diff --git a/snapi-client/src/main/java/module-info.java b/snapi-compiler/src/main/java/module-info.java similarity index 63% rename from snapi-client/src/main/java/module-info.java rename to snapi-compiler/src/main/java/module-info.java index 4de0095c8..fb0d04aeb 100644 --- a/snapi-client/src/main/java/module-info.java +++ b/snapi-compiler/src/main/java/module-info.java @@ -10,20 +10,23 @@ * licenses/APL.txt. */ +import com.rawlabs.compiler.CompilerServiceBuilder; +import com.rawlabs.snapi.compiler.Rql2TruffleCompilerServiceBuilder; + module raw.snapi.client { requires scala.library; requires org.slf4j; requires org.graalvm.polyglot; - requires raw.utils; + requires raw.utils.core; requires com.fasterxml.jackson.dataformat.csv; requires com.fasterxml.jackson.core; - requires raw.sources; - requires raw.protocol; - requires raw.client; + requires raw.utils.sources; + requires raw.protocol.compiler; + requires raw.compiler; requires raw.snapi.frontend; - uses raw.client.api.CompilerServiceBuilder; + uses CompilerServiceBuilder; - provides raw.client.api.CompilerServiceBuilder with - raw.client.rql2.truffle.Rql2TruffleCompilerServiceBuilder; + provides CompilerServiceBuilder with + Rql2TruffleCompilerServiceBuilder; } diff --git a/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder b/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder new file mode 100644 index 000000000..1d8e36816 --- /dev/null +++ b/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder @@ -0,0 +1 @@ +com.rawlabs.snapi.compiler.Rql2TruffleCompilerServiceBuilder \ No newline at end of file diff --git a/snapi-client/src/main/scala/raw/client/rql2/truffle/CustomClassAndModuleLoader.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/CustomClassAndModuleLoader.scala similarity index 98% rename from snapi-client/src/main/scala/raw/client/rql2/truffle/CustomClassAndModuleLoader.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/CustomClassAndModuleLoader.scala index 170adcff1..311873f08 100644 --- a/snapi-client/src/main/scala/raw/client/rql2/truffle/CustomClassAndModuleLoader.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/CustomClassAndModuleLoader.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.rql2.truffle +package com.rawlabs.snapi.compiler import com.typesafe.scalalogging.StrictLogging diff --git a/snapi-client/src/main/scala/raw/client/rql2/api/Rql2CompilerService.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala similarity index 82% rename from snapi-client/src/main/scala/raw/client/rql2/api/Rql2CompilerService.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala index a680e6cac..9acd854a1 100644 --- a/snapi-client/src/main/scala/raw/client/rql2/api/Rql2CompilerService.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.client.rql2.api +package com.rawlabs.snapi.compiler -import raw.client.api.{CompilerService, Message, ProgramEnvironment} -import raw.compiler.base.source.{BaseNode, Type} -import raw.compiler.common.source.SourceProgram -import raw.utils.RawUid +import com.rawlabs.compiler.{CompilerService, Message, ProgramEnvironment} +import com.rawlabs.utils.core.RawUid +import com.rawlabs.snapi.frontend.base.source.{BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source.SourceProgram trait Rql2CompilerService extends CompilerService { diff --git a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2TruffleCompilerService.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala similarity index 93% rename from snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2TruffleCompilerService.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala index 8ac97bb3a..ec795cfad 100644 --- a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2TruffleCompilerService.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala @@ -10,27 +10,66 @@ * licenses/APL.txt. */ -package raw.client.rql2.truffle - +package com.rawlabs.snapi.compiler + +import com.rawlabs.compiler.{ + AutoCompleteResponse, + CompilerService, + CompilerServiceException, + DeclDescription, + ErrorMessage, + ErrorPosition, + ErrorRange, + ExecutionResponse, + ExecutionRuntimeFailure, + ExecutionSuccess, + ExecutionValidationFailure, + FormatCodeResponse, + GetProgramDescriptionFailure, + GetProgramDescriptionResponse, + GetProgramDescriptionSuccess, + GoToDefinitionResponse, + HoverResponse, + Message, + ParamDescription, + Pos, + ProgramDescription, + ProgramEnvironment, + RawBool, + RawByte, + RawDate, + RawDecimal, + RawDouble, + RawFloat, + RawInt, + RawInterval, + RawLong, + RawNull, + RawShort, + RawString, + RawTime, + RawTimestamp, + RawValue, + RenameResponse, + ValidateResponse +} +import com.rawlabs.compiler.writers.{PolyglotBinaryWriter, PolyglotTextWriter} +import com.rawlabs.utils.core.{RawSettings, RawUid, RawUtils} import org.bitbucket.inkytonik.kiama.relation.LeaveAlone import org.bitbucket.inkytonik.kiama.util.{Position, Positions} import org.graalvm.polyglot._ -import raw.client.api._ -import raw.client.rql2.api._ -import raw.client.writers.{PolyglotBinaryWriter, PolyglotTextWriter} -import raw.compiler.base -import raw.compiler.base.errors._ -import raw.compiler.base.source.BaseNode -import raw.compiler.base.{CompilerContext, TreeDeclDescription, TreeDescription, TreeParamDescription} -import raw.compiler.common.source.{SourceNode, SourceProgram} -import raw.compiler.rql2._ -import raw.compiler.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult, ParseTypeResult, ParserErrors} -import raw.compiler.rql2.builtin.{BinaryPackage, CsvPackage, JsonPackage, StringPackage} -import raw.compiler.rql2.errors._ -import raw.compiler.rql2.lsp.CompilerLspService -import raw.compiler.rql2.source._ -import raw.inferrer.api.InferrerServiceProvider -import raw.utils.{RawSettings, RawUid, RawUtils} +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.base.errors._ +import com.rawlabs.snapi.frontend.base.source.BaseNode +import com.rawlabs.snapi.frontend.base.{CompilerContext, TreeDeclDescription, TreeDescription, TreeParamDescription} +import com.rawlabs.snapi.frontend.common.source.{SourceNode, SourceProgram} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult, ParseTypeResult, ParserErrors} +import com.rawlabs.snapi.frontend.rql2.builtin.{BinaryPackage, CsvPackage, JsonPackage, StringPackage} +import com.rawlabs.snapi.frontend.rql2.errors._ +import com.rawlabs.snapi.frontend.rql2.lsp.CompilerLspService +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api.InferrerServiceProvider import java.io.{IOException, OutputStream} import scala.collection.mutable @@ -39,7 +78,7 @@ import scala.util.control.NonFatal object Rql2TruffleCompilerService { val LANGUAGE: Set[String] = Set("rql2", "rql2-truffle", "snapi") - val JARS_PATH = "raw.client.rql2.jars-path" + val JARS_PATH = "com.rawlabs.snapi.compiler.jars-path" } class Rql2TruffleCompilerService(engineDefinition: (Engine, Boolean))(implicit protected val settings: RawSettings) @@ -267,10 +306,9 @@ class Rql2TruffleCompilerService(engineDefinition: (Engine, Boolean))(implicit p if (!CsvPackage.outputWriteSupport(tipe)) { return ExecutionRuntimeFailure("unsupported type") } - val programContext = getProgramContext(environment.uid, environment) val windowsLineEnding = environment.options.get("windows-line-ending") match { case Some("true") => true - case _ => programContext.settings.config.getBoolean("raw.compiler.windows-line-ending") + case _ => false } val lineSeparator = if (windowsLineEnding) "\r\n" else "\n" val w = new Rql2CsvWriter(outputStream, lineSeparator, maxRows) diff --git a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2TruffleCompilerServiceBuilder.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerServiceBuilder.scala similarity index 78% rename from snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2TruffleCompilerServiceBuilder.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerServiceBuilder.scala index d89905701..a8c56ae8f 100644 --- a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2TruffleCompilerServiceBuilder.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerServiceBuilder.scala @@ -10,10 +10,11 @@ * licenses/APL.txt. */ -package raw.client.rql2.truffle +package com.rawlabs.snapi.compiler -import raw.client.api.{CompilerService, CompilerServiceBuilder} -import raw.utils.RawSettings +import com.rawlabs.compiler.CompilerServiceBuilder +import com.rawlabs.compiler.CompilerService +import com.rawlabs.utils.core.RawSettings class Rql2TruffleCompilerServiceBuilder extends CompilerServiceBuilder { override def language: Set[String] = Rql2TruffleCompilerService.LANGUAGE diff --git a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2CsvWriter.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala similarity index 92% rename from snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2CsvWriter.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala index ccfd4c120..475ed8679 100644 --- a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2CsvWriter.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala @@ -10,36 +10,14 @@ * licenses/APL.txt. */ -package raw.client.rql2.truffle +package com.rawlabs.snapi.compiler -import com.fasterxml.jackson.core.JsonEncoding -import com.fasterxml.jackson.core.JsonParser -import org.graalvm.polyglot.Value -import raw.compiler.rql2.source.{ - Rql2BinaryType, - Rql2BoolType, - Rql2ByteType, - Rql2DateType, - Rql2DecimalType, - Rql2DoubleType, - Rql2FloatType, - Rql2IntType, - Rql2IntervalType, - Rql2IsNullableTypeProperty, - Rql2IsTryableTypeProperty, - Rql2IterableType, - Rql2ListType, - Rql2LongType, - Rql2RecordType, - Rql2ShortType, - Rql2StringType, - Rql2TimeType, - Rql2TimestampType, - Rql2TypeWithProperties -} -import com.fasterxml.jackson.dataformat.csv.{CsvFactory, CsvSchema} +import com.fasterxml.jackson.core.{JsonEncoding, JsonParser} import com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING -import raw.client.utils.RecordFieldsNaming +import com.fasterxml.jackson.dataformat.csv.{CsvFactory, CsvSchema} +import com.rawlabs.compiler.utils.RecordFieldsNaming +import com.rawlabs.snapi.frontend.rql2.source._ +import org.graalvm.polyglot.Value import java.io.{Closeable, IOException, OutputStream} import java.time.format.DateTimeFormatter diff --git a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2JsonWriter.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala similarity index 97% rename from snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2JsonWriter.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala index 38651bf47..5b11f9bc2 100644 --- a/snapi-client/src/main/scala/raw/client/rql2/truffle/Rql2JsonWriter.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.client.rql2.truffle +package com.rawlabs.snapi.compiler import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonParser} +import com.rawlabs.compiler.utils.RecordFieldsNaming +import com.rawlabs.snapi.frontend.rql2.Rql2TypeUtils +import com.rawlabs.snapi.frontend.rql2.source._ import org.graalvm.polyglot.Value -import raw.client.utils.RecordFieldsNaming -import raw.compiler.rql2.Rql2TypeUtils -import raw.compiler.rql2.source._ import java.io.{Closeable, IOException, OutputStream} import java.time.format.DateTimeFormatter diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/api/Rql2CompilerServiceTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/api/Rql2CompilerServiceTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala index 75c4d491d..d06d9abe5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/api/Rql2CompilerServiceTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.api +package com.rawlabs.snapi.compiler +import com.rawlabs.compiler.CompilerServiceProvider +import com.rawlabs.utils.core.RawTestSuite import org.scalatest.BeforeAndAfterAll -import raw.client.api.CompilerServiceProvider -import raw.client.rql2.api.Rql2CompilerService -import raw.utils.RawTestSuite trait Rql2CompilerServiceTestContext extends BeforeAndAfterAll { this: RawTestSuite => diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/api/Rql2OutputTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2OutputTestContext.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/api/Rql2OutputTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2OutputTestContext.scala index f9a10c5b0..dedf5b54e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/api/Rql2OutputTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2OutputTestContext.scala @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.api +package com.rawlabs.snapi.compiler import com.fasterxml.jackson.core.JsonParser import com.fasterxml.jackson.core.json.JsonReadFeature import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule} import com.google.common.collect.HashMultiset +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} import org.bitbucket.inkytonik.kiama.util.Positions -import raw.compiler.base.source.Type -import raw.compiler.rql2.FrontendSyntaxAnalyzer -import raw.compiler.rql2.source._ -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzer +import com.rawlabs.snapi.frontend.rql2.source._ import java.nio.file.Path import scala.collection.JavaConverters._ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/FailAfterNServer.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/FailAfterNServer.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/FailAfterNServer.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/FailAfterNServer.scala index 6cffd863e..1348614e5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/FailAfterNServer.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/FailAfterNServer.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests +package com.rawlabs.snapi.compiler.tests import com.sun.net.httpserver.{HttpExchange, HttpServer} import com.typesafe.scalalogging.StrictLogging diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2CompilerTestContext.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2CompilerTestContext.scala index 7cfc5cf62..46a1e2f1b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/Rql2CompilerTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2CompilerTestContext.scala @@ -10,18 +10,39 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests - +package com.rawlabs.snapi.compiler.tests + +import com.rawlabs.compiler.{ + AutoCompleteResponse, + ExecutionRuntimeFailure, + ExecutionSuccess, + ExecutionValidationFailure, + FormatCodeResponse, + GoToDefinitionResponse, + HoverResponse, + Pos, + ProgramEnvironment, + RawValue, + RenameResponse, + ValidateResponse +} +import com.rawlabs.utils.core.{ + RawException, + RawTestSuite, + RawUid, + RawUtils, + SettingsTestContext, + TestData, + TrainingWheelsContext +} import org.scalatest.Tag import org.scalatest.exceptions.TestFailedException import org.scalatest.matchers.should.Matchers import org.scalatest.matchers.{MatchResult, Matcher} -import raw.client.api._ -import raw.client.rql2.api._ -import raw.compiler.base.source.{BaseProgram, Type} -import raw.compiler.rql2.api.{Rql2CompilerServiceTestContext, Rql2OutputTestContext} -import raw.inferrer.local.LocalInferrerTestContext -import raw.protocol.{ +import com.rawlabs.snapi.compiler._ +import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} +import com.rawlabs.snapi.frontend.inferrer.local.LocalInferrerTestContext +import com.rawlabs.protocol.compiler.{ DropboxAccessTokenConfig, HttpHeadersConfig, LocationConfig, @@ -33,7 +54,8 @@ import raw.protocol.{ SQLServerConfig, SnowflakeConfig } -import raw.utils._ +import com.rawlabs.utils.core._ +import com.rawlabs.snapi.compiler.{Rql2CompilerServiceTestContext, Rql2OutputTestContext} import java.io.{ByteArrayOutputStream, FileWriter} import java.nio.charset.{Charset, StandardCharsets} diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/benchmark/BenchmarkTests.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/benchmark/BenchmarkTests.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala index ec9366a6b..1aa73cdef 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/benchmark/BenchmarkTests.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.benchmark +package com.rawlabs.snapi.compiler.tests.benchmark -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BenchmarkTests extends Rql2TruffleCompilerTestContext { +class BenchmarkTests extends Rql2TruffleCompilerTestContext { property("raw.training-wheels", "false") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/benchmark/StressTests.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala similarity index 84% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/benchmark/StressTests.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala index 96e5dadd6..b4a447b1f 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/benchmark/StressTests.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.benchmark +package com.rawlabs.snapi.compiler.tests.benchmark -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class StressTests extends Rql2TruffleCompilerTestContext { +class StressTests extends Rql2TruffleCompilerTestContext { val shouldBeExecuted = false diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/BinaryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala similarity index 85% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/BinaryPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala index 55188cf8c..71d060e83 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/BinaryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala @@ -10,16 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Path import java.util.Base64 -@TruffleTests class BinaryPackageTest extends Rql2TruffleCompilerTestContext { +class BinaryPackageTest extends Rql2TruffleCompilerTestContext { // FIXME (msb): This should use cast to support string to binary and do .getBytes("utf-8") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/BytePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/BytePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala index 293dcb27a..dff1b06e8 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/BytePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BytePackageTest extends Rql2TruffleCompilerTestContext { +class BytePackageTest extends Rql2TruffleCompilerTestContext { test(""" Byte.From(1)""")(it => it should evaluateTo("1b")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/CsvPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala similarity index 99% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/CsvPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala index 1b66efbde..ab6314d2a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/CsvPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class CsvPackageTest extends Rql2TruffleCompilerTestContext { +class CsvPackageTest extends Rql2TruffleCompilerTestContext { val ttt = "\"\"\"" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DatePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DatePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala index aa17d0b37..621b4d8a5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DatePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class DatePackageTest extends Rql2TruffleCompilerTestContext { +class DatePackageTest extends Rql2TruffleCompilerTestContext { test("Date.Build(2022, 1, 15)") { it => it should typeAs("date") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DecimalPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DecimalPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala index e3e302b98..964caa193 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DecimalPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class DecimalPackageTest extends Rql2TruffleCompilerTestContext { +class DecimalPackageTest extends Rql2TruffleCompilerTestContext { test("""Decimal.Round(Decimal.From("1.423"), 2)""") { it => it should evaluateTo("""1.42q""") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DoublePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DoublePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala index 132cabd6a..ddfde8f89 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/DoublePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class DoublePackageTest extends Rql2TruffleCompilerTestContext { +class DoublePackageTest extends Rql2TruffleCompilerTestContext { test(""" Double.From(1)""")(it => it should evaluateTo("1.0")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/EnvironmentPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala similarity index 80% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/EnvironmentPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala index e80068d19..ab438af35 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/EnvironmentPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin import com.google.common.collect.HashMultiset -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import scala.collection.JavaConverters._ -@TruffleTests class EnvironmentPackageTest extends Rql2TruffleCompilerTestContext { +class EnvironmentPackageTest extends Rql2TruffleCompilerTestContext { test("""Environment.Secret("my-typo")""")(it => it should runErrorAs("unknown secret: my-typo")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/ErrorPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/ErrorPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala index cb203f585..8aa1aa945 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/ErrorPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ErrorPackageTest extends Rql2TruffleCompilerTestContext { +class ErrorPackageTest extends Rql2TruffleCompilerTestContext { test(""" Error.Build("an error")""")(it => it should runErrorAs("an error")) test(""" Error.Build("an error") == Error.Build("an error")""")(it => it should runErrorAs("an error")) test(""" Error.Build("an error") == Error.Build("another error")""")(it => it should runErrorAs("an error")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/FloatPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/FloatPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala index e3b5da877..54e155bf1 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/FloatPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class FloatPackageTest extends Rql2TruffleCompilerTestContext { +class FloatPackageTest extends Rql2TruffleCompilerTestContext { test(""" Float.From(1)""")(it => it should evaluateTo("1.0f")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/FunctionPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/FunctionPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala index 54ed43612..e48ce7b9b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/FunctionPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class FunctionPackageTest extends Rql2TruffleCompilerTestContext { +class FunctionPackageTest extends Rql2TruffleCompilerTestContext { test("""Function.InvokeAfter(() -> 1 +1, 10)""".stripMargin)(_ should evaluateTo("2")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/HttpPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/HttpPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala index 3991049ac..c38a1a5bd 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/HttpPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala @@ -10,17 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin import com.sun.net.httpserver.{BasicAuthenticator, HttpExchange, HttpServer} import com.typesafe.scalalogging.StrictLogging -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.net.InetSocketAddress import scala.collection.JavaConverters._ -@TruffleTests class HttpPackageTest extends Rql2TruffleCompilerTestContext { +class HttpPackageTest extends Rql2TruffleCompilerTestContext { val expectedUser = "user" val expectedPassword = "passwd" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/IntPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala similarity index 85% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/IntPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala index 90547421d..395cadc89 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/IntPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class IntPackageTest extends Rql2TruffleCompilerTestContext { +class IntPackageTest extends Rql2TruffleCompilerTestContext { test(""" Int.From(1)""")(it => it should evaluateTo("1")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/IntervalPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/IntervalPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala index 56d16a474..3eed5aea8 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/IntervalPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class IntervalPackageTest extends Rql2TruffleCompilerTestContext { +class IntervalPackageTest extends Rql2TruffleCompilerTestContext { test("Interval.Build(months=12) == Interval.Build(years=1)")(_ should evaluateTo("true")) test("Interval.Build(hours=24) == Interval.Build(days=1)")(_ should evaluateTo("true")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/JsonPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala similarity index 99% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/JsonPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala index c4767d2bb..a3e73d21a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/JsonPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class JsonPackageTest extends Rql2TruffleCompilerTestContext { +class JsonPackageTest extends Rql2TruffleCompilerTestContext { private val junkAfter10Items = tempFile("""[ | {"a": 1, "b": "#1", "c": 1.1}, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LibraryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LibraryPackageTest.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LibraryPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LibraryPackageTest.scala index 710e3a6f4..72345765a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LibraryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LibraryPackageTest.scala @@ -10,14 +10,6 @@ * licenses/APL.txt. */ -//package raw.compiler.rql2.tests.builtin -// -//import raw.compiler.rql2.tests.{RunnerScalaTestContext, RunnerTestContext} -//import raw.testing.tags.Tier1 -// -//@Tier1 -//class LibraryPackageScala2Test extends RunnerScalaTestContext with LibraryPackageTest -// //trait LibraryPackageTest extends RunnerTestContext { // // val simpleLib: String = lib(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LocationPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LocationPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala index 4a5c76fe3..da307400f 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LocationPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala @@ -10,16 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import java.nio.file.Path -@TruffleTests class LocationPackageTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class LocationPackageTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test(s""" |let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LongPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala similarity index 83% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LongPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala index 03bff6726..0eb68d848 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/LongPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LongPackageTest extends Rql2TruffleCompilerTestContext { +class LongPackageTest extends Rql2TruffleCompilerTestContext { test(""" Long.From(1)""")(it => it should evaluateTo("1L")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/MathPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/MathPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala index 9b2fedeba..d7eb0d55e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/MathPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class MathPackageTest extends Rql2TruffleCompilerTestContext { +class MathPackageTest extends Rql2TruffleCompilerTestContext { // Nullable - Tryable tests test("""Math.Sin(if(true) then 3.13 else null)""")(_ should beCloseTo("0.011592393936158275")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/NullablePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala similarity index 79% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/NullablePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala index 93452d690..2a43d881b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/NullablePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class NullablePackageTest extends Rql2TruffleCompilerTestContext { +class NullablePackageTest extends Rql2TruffleCompilerTestContext { test("""Nullable.IsNull(null)""")(_ should evaluateTo("true")) test("""Nullable.IsNull(1)""")(_ should evaluateTo("false")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/NullableTryablePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/NullableTryablePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala index d7328f039..44d52ce0a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/NullableTryablePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class NullableTryablePackageTest extends Rql2TruffleCompilerTestContext { +class NullableTryablePackageTest extends Rql2TruffleCompilerTestContext { test("""1 / null""")(_ should evaluateTo("null")) test(""" 1.0 / (if true then null else 2)""")(_ should evaluateTo("null")) test(""" 1.0 / (if false then null else 2)""")(_ should evaluateTo("0.5")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/RecordPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/RecordPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala index 3ee63dfb0..c8d095feb 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/RecordPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RecordPackageTest extends Rql2TruffleCompilerTestContext { +class RecordPackageTest extends Rql2TruffleCompilerTestContext { test("""Record.Build(a = 1, b = "Hello")""".stripMargin)(_ should (typeAs("record(a: int, b: string)") and run)) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/RegexPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/RegexPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala index 11250b413..1b8bc890d 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/RegexPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RegexPackageTest extends Rql2TruffleCompilerTestContext { +class RegexPackageTest extends Rql2TruffleCompilerTestContext { test("""Regex.Replace("Heelloo John", "[aeiou]+", "_")""")(it => it should evaluateTo(""" "H_ll_ J_hn" """)) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/S3PackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala similarity index 77% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/S3PackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala index 5881d24f2..bec896f97 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/S3PackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class S3PackageTest extends Rql2TruffleCompilerTestContext { +class S3PackageTest extends Rql2TruffleCompilerTestContext { - import raw.compiler.rql2.tests.TestCredentials._ + import com.rawlabs.snapi.compiler.tests.TestCredentials._ // reading a public s3 bucket without registering or passing credentials test(s"""let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/ShortPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala similarity index 83% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/ShortPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala index 1b456991a..d956e484c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/ShortPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ShortPackageTest extends Rql2TruffleCompilerTestContext { +class ShortPackageTest extends Rql2TruffleCompilerTestContext { test(""" Short.From(1)""")(it => it should evaluateTo("1s")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/StringPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/StringPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala index 0121680bf..19637fef3 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/StringPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala @@ -10,17 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin import java.util.Base64 -import raw.compiler.utils._ -import raw.compiler.rql2.tests.FailAfterNServer -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.FailAfterNServer +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Path -@TruffleTests class StringPackageTest extends Rql2TruffleCompilerTestContext with FailAfterNServer { +class StringPackageTest extends Rql2TruffleCompilerTestContext with FailAfterNServer { // Each line has 11 bytes so it will fail at line 10 more or less. override def failServices: Seq[FailAfter] = Seq( @@ -210,10 +209,10 @@ import java.nio.file.Path |2022-09-14 15:09:49.862+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.c.client.ClientCredentialsService - Adding service: raw.creds.client.ClientCredentialsService@3f93f951 |2022-09-14 15:09:49.863+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG raw.rest.client.RestClient - [credentials] Creating REST Client (http://localhost:42375/) |2022-09-14 15:09:49.907+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] INFO raw.runtime.DriverRuntimeContext$ - Creating new instance - |2022-09-14 15:09:49.907+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.s.b.EhCacheByteStreamCache - Adding service: raw.sources.bytestream.EhCacheByteStreamCache@20ef8c7a + |2022-09-14 15:09:49.907+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.s.b.EhCacheByteStreamCache - Adding service: com.rawlabs.utils.sources.bytestream.EhCacheByteStreamCache@20ef8c7a |2022-09-14 15:09:49.908+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.s.b.EhCacheByteStreamCache - [1] Creating new instance |2022-09-14 15:09:49.918+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] INFO org.ehcache.core.EhcacheManager - Cache 'is-cache' created in EhcacheManager. - |2022-09-14 15:09:49.920+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.s.f.hadoop.HadoopSourceContext - Adding service: raw.sources.filesystem.hadoop.HadoopSourceContext@72d29c48 + |2022-09-14 15:09:49.920+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.s.f.hadoop.HadoopSourceContext - Adding service: com.rawlabs.utils.sources.filesystem.hadoop.HadoopSourceContext@72d29c48 |2022-09-14 15:09:49.921+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG r.s.client.ClientStorageService - Adding service: raw.storage.client.ClientStorageService@eb7a252 |2022-09-14 15:09:49.921+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] DEBUG raw.rest.client.RestClient - [storage] Creating REST Client (http://localhost:45231/) |2022-09-14 15:09:49.923+0200 [Executor task launch worker for task 0.0 in stage 0.0 (TID 0)] INFO raw.config.RawSettings$ - Using raw.runtime.spark.worker-listener.enabled: true (boolean) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/SuccessPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/SuccessPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala index 36052f3e1..6119cf8f9 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/SuccessPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class SuccessPackageTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class SuccessPackageTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { test("Success.Build(1)")(_ should evaluateTo("1")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TimePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TimePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala index d5ccd62fb..f13de3b00 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TimePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class TimePackageTest extends Rql2TruffleCompilerTestContext { +class TimePackageTest extends Rql2TruffleCompilerTestContext { test("Time.Build(9, 30)") { it => it should typeAs("time") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TimestampPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TimestampPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala index 97d25ebb7..3823de74a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TimestampPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class TimestampPackageTest extends Rql2TruffleCompilerTestContext { +class TimestampPackageTest extends Rql2TruffleCompilerTestContext { test("Timestamp.Build(2022, 1, 15, 9, 30)") { it => it should typeAs("timestamp") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TryPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala index c090ca2df..404b0b7e7 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class TryPackageTest extends Rql2TruffleCompilerTestContext { +class TryPackageTest extends Rql2TruffleCompilerTestContext { test("""Try.IsError("hi")""")(_ should evaluateTo("false")) test("""Try.IsError(1)""")(_ should evaluateTo("false")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TypePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TypePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala index 2c782d0d7..0886ac2e2 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/TypePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class TypePackageTest extends Rql2TruffleCompilerTestContext { +class TypePackageTest extends Rql2TruffleCompilerTestContext { ignore("""Types.Merge(int, float)""")(it => it should typeAs("float")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/XmlPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/XmlPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala index c0f4e7281..e6b75de10 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/XmlPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin +package com.rawlabs.snapi.compiler.tests.builtin -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class XmlPackageTest extends Rql2TruffleCompilerTestContext { +class XmlPackageTest extends Rql2TruffleCompilerTestContext { private val allTypes = tempFile(""" | 120 diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala similarity index 74% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionDistinctTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala index d193a5125..665400d64 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class CollectionDistinctTest extends Rql2TruffleCompilerTestContext { +class CollectionDistinctTest extends Rql2TruffleCompilerTestContext { test("""let numbers = Collection.From([5, 2, 4, 2, 2, 4, 5]) |in Collection.Distinct(numbers)""".stripMargin)(_ should evaluateTo("[2, 4, 5]")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionExplodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionExplodeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala index dd294a415..007781069 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionExplodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class CollectionExplodeTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionExplodeTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { private val nba = tempFile("""[ | {"team": {"name": "Bulls", "city": "Chicago"}, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionGroupByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionGroupByTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala index 3af9a9c25..881aa3c86 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionGroupByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.utils._ -import raw.compiler.rql2.errors.KeyNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class CollectionGroupByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionGroupByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { private val lineitemType = """record( | l_orderkey: int, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionJoinTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala index 763f02def..189af2014 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.utils._ -import raw.compiler.rql2.errors.KeyNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class CollectionJoinTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionJoinTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test(snapi"""let regions = Csv.InferAndRead("$tpchRegionCsvLocal"), | nations = Csv.InferAndRead("$tpchNationCsvLocal") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionMinMaxTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionMinMaxTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala index cb8fa6fa1..cce6aaf9c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionMinMaxTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class CollectionMinMaxTest extends Rql2TruffleCompilerTestContext { +class CollectionMinMaxTest extends Rql2TruffleCompilerTestContext { // Date test(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionMkStringTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionMkStringTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala index 4e8c3f1b3..58ac580fa 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionMkStringTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class CollectionMkStringTest extends Rql2TruffleCompilerTestContext { +class CollectionMkStringTest extends Rql2TruffleCompilerTestContext { test("""let items = Collection.Build() |in Collection.MkString(items, sep="|")""".stripMargin)(_ should evaluateTo(""" "" """)) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionOrderByTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala index bc496369a..ce6afe9b4 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.utils._ -import raw.compiler.rql2.errors.{InvalidOrderSpec, KeyNotComparable, OrderSpecMustFollowOrderingFunction} -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.{InvalidOrderSpec, KeyNotComparable, OrderSpecMustFollowOrderingFunction} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class CollectionOrderByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionOrderByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { private val coolBandsWithoutHeader = tempFile("""Bee Gees|Maurice|Gibb|1949 |Bee Gees|Robin|Gibb|1949 diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala index 772cb803d..7cdf807f1 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala @@ -10,16 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.utils._ -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Path -@TruffleTests class CollectionPackageTest extends Rql2TruffleCompilerTestContext { +class CollectionPackageTest extends Rql2TruffleCompilerTestContext { // a test to check if there are multiple instances of generators test("""let a = Collection.Build(1,2,3), diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionRangeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionRangeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala index 10f1713bd..82dc1dc0c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionRangeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class CollectionRangeTest extends Rql2TruffleCompilerTestContext { +class CollectionRangeTest extends Rql2TruffleCompilerTestContext { // Long.Range diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionUnionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionUnionTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala index 7c7647484..6792dbfd1 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/collection/CollectionUnionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.collection +package com.rawlabs.snapi.compiler.tests.builtin.collection -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class CollectionUnionTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionUnionTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test("Collection.Union(Collection.Build(1,2,3), Collection.Build(4,5,6))")(_ should evaluateTo("[1,2,3,4,5,6]")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/AwsPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/AwsPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala index 62286b4d1..c456ae1a7 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/AwsPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class AwsPackageTest extends Rql2TruffleCompilerTestContext { +class AwsPackageTest extends Rql2TruffleCompilerTestContext { val accessKeyId = sys.env("RAW_AWS_ACCESS_KEY_ID") val secretAccessKey = sys.env("RAW_AWS_SECRET_ACCESS_KEY") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/EnvironmentPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala similarity index 79% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/EnvironmentPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala index 67b716112..f4849d0fc 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/EnvironmentPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class EnvironmentPackageTest extends Rql2TruffleCompilerTestContext { +class EnvironmentPackageTest extends Rql2TruffleCompilerTestContext { secret("my-secret", "my-secret-value") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/LocationPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/LocationPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala index ec2554ada..632d63a6f 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/LocationPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala @@ -10,20 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LocationPackageTest extends Rql2TruffleCompilerTestContext { +class LocationPackageTest extends Rql2TruffleCompilerTestContext { - import raw.compiler.rql2.tests.TestCredentials._ + import com.rawlabs.snapi.compiler.tests.TestCredentials._ httpHeaders("dropbox-token", Map("Authorization" -> ("Bearer " + dropboxLongLivedAccessToken))) s3Bucket(UnitTestPrivateBucket2, UnitTestPrivateBucket2Cred) - property("raw.sources.dropbox.clientId", dropboxClientId) + property("raw.utils.sources.dropbox.clientId", dropboxClientId) test(""" |String.Read( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala index f7f48bca0..5354b7ca0 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/MySQLPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class MySQLPackageTest extends Rql2TruffleCompilerTestContext { +class MySQLPackageTest extends Rql2TruffleCompilerTestContext { import TestCredentials._ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala index bddc5a8a7..24dac09be 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/OraclePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class OraclePackageTest extends Rql2TruffleCompilerTestContext { +class OraclePackageTest extends Rql2TruffleCompilerTestContext { import TestCredentials._ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala index 62bc05784..7217e36cc 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/PostgreSQLPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class PostgreSQLPackageTest extends Rql2TruffleCompilerTestContext { +class PostgreSQLPackageTest extends Rql2TruffleCompilerTestContext { import TestCredentials._ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/S3PackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala similarity index 90% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/S3PackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala index 44eccfcf0..f46dd97ef 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/S3PackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class S3PackageTest extends Rql2TruffleCompilerTestContext { +class S3PackageTest extends Rql2TruffleCompilerTestContext { import TestCredentials._ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala index 1d50a22af..9e3b99b60 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SQLServerPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class SQLServerPackageTest extends Rql2TruffleCompilerTestContext { +class SQLServerPackageTest extends Rql2TruffleCompilerTestContext { import TestCredentials._ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala index 21b49f418..fb92d9638 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/credentials/SnowflakePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.credentials +package com.rawlabs.snapi.compiler.tests.builtin.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class SnowflakePackageTest extends Rql2TruffleCompilerTestContext { +class SnowflakePackageTest extends Rql2TruffleCompilerTestContext { import TestCredentials._ @@ -76,7 +75,7 @@ import raw.testing.tags.TruffleTests |}]""".stripMargin) } - property("raw.sources.rdbms.network-timeout", "10s") + property("raw.utils.sources.rdbms.network-timeout", "10s") test(s"""Snowflake.InferAndRead("snowflake", "$snowflakeSchema", "$snowflakeMainTable")""") { it => it should evaluateTo( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala similarity index 74% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListDistinctTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala index e725ca5b5..375270ca9 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ListDistinctTest extends Rql2TruffleCompilerTestContext { +class ListDistinctTest extends Rql2TruffleCompilerTestContext { test("""let numbers = [5, 2, 4, 2, 2, 4, 5] |in List.Distinct(numbers)""".stripMargin)(_ should evaluateTo("[2, 4, 5]")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListExplodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListExplodeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala index 352d7a690..60c62a2d9 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListExplodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class ListExplodeTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListExplodeTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { private val nba = tempFile("""[ | {"team": {"name": "Bulls", "city": "Chicago"}, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListGroupByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListGroupByTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala index 470a6439f..8658126ae 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListGroupByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.utils._ -import raw.compiler.rql2.errors.KeyNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class ListGroupByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListGroupByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { private val lineitemType = """record( | l_orderkey: int, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListJoinTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala index 5928ac0ee..c1e4aebea 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.utils._ -import raw.compiler.rql2.errors.KeyNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class ListJoinTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListJoinTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { private val listOfCountries = """[ | {region: "AFRICA", nation: "ALGERIA"}, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListMinMaxTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListMinMaxTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala index fddc0bf26..690af7c7e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListMinMaxTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ListMinMaxTest extends Rql2TruffleCompilerTestContext { +class ListMinMaxTest extends Rql2TruffleCompilerTestContext { // Date test(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListMkStringTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListMkStringTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala index c78a3431c..d407dc9dd 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListMkStringTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ListMkStringTest extends Rql2TruffleCompilerTestContext { +class ListMkStringTest extends Rql2TruffleCompilerTestContext { test("""let items = List.Build() |in List.MkString(items, sep="|")""".stripMargin)(_ should evaluateTo(""" "" """)) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListOrderByTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala index e6c64b32d..56038b807 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.utils._ -import raw.compiler.rql2.errors.{InvalidOrderSpec, KeyNotComparable} -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.{InvalidOrderSpec, KeyNotComparable} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class ListOrderByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListOrderByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { // using String.ReadLines test(snapi"""let regions = List.From(Collection.Transform( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala index 66358aa79..ecc7902cc 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala @@ -10,16 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.utils._ -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Path -@TruffleTests class ListPackageTest extends Rql2TruffleCompilerTestContext { +class ListPackageTest extends Rql2TruffleCompilerTestContext { test("""["Hello", Error.Build("Argh!!"), null]""") { _ should evaluateTo("""["Hello", Error.Build("Argh!!"), null]""") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListUnionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListUnionTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala index e6e560b47..045a4a0bb 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/builtin/list/ListUnionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.builtin.list +package com.rawlabs.snapi.compiler.tests.builtin.list -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class ListUnionTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListUnionTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test("List.Union([1,2,3], [4,5,6])")(_ should evaluateTo("[1,2,3,4,5,6]")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/hints/SemanticAnalyzerHintsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/hints/SemanticAnalyzerHintsTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala index d6f271e28..390e7004a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/hints/SemanticAnalyzerHintsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.hints +package com.rawlabs.snapi.compiler.tests.hints -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class SemanticAnalyzerHintsTest extends Rql2TruffleCompilerTestContext { +class SemanticAnalyzerHintsTest extends Rql2TruffleCompilerTestContext { test("""Rekord.Build(a=1)""")(it => it should typeErrorAs("did you mean Record.Build?")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspAiValidateTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspAiValidateTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala index f9dc0e2b0..14669d8be 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspAiValidateTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api.ValidateResponse -import raw.compiler.rql2.errors.OutputTypeRequiredForRecursiveFunction -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.ValidateResponse +import com.rawlabs.snapi.frontend.rql2.errors.OutputTypeRequiredForRecursiveFunction +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspAiValidateTest extends Rql2TruffleCompilerTestContext { +class LspAiValidateTest extends Rql2TruffleCompilerTestContext { test("AI validate package that does not exist") { _ => val code = """let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspBrokenCodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspBrokenCodeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala index 278ea73db..e35c6b23d 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspBrokenCodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{HoverResponse, Pos, TypeCompletion} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspBrokenCodeTest extends Rql2TruffleCompilerTestContext { +class LspBrokenCodeTest extends Rql2TruffleCompilerTestContext { test("broken code hover test") { _ => val code = """let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspCommentsFormatTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala similarity index 99% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspCommentsFormatTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala index 68de5229e..877eb423a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspCommentsFormatTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.FormatCodeResponse +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspCommentsFormatTest extends Rql2TruffleCompilerTestContext { +class LspCommentsFormatTest extends Rql2TruffleCompilerTestContext { def assertFormattedCode( code: String, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspCompilationMessagesTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala similarity index 80% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspCompilationMessagesTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala index 01a226201..5f9b66f03 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspCompilationMessagesTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala @@ -10,14 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api.{ErrorMessage, WarningMessage} -import raw.compiler.base.errors.{MissingSecretWarning, UnknownDecl} -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests - -@TruffleTests class LspCompilationMessagesTest extends Rql2TruffleCompilerTestContext { +import com.rawlabs.compiler.{ErrorMessage, WarningMessage} +import com.rawlabs.snapi.frontend.base.errors.{MissingSecretWarning, UnknownDecl} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +class LspCompilationMessagesTest extends Rql2TruffleCompilerTestContext { test("should return a waning") { _ => val code = """let a = Environment.Secret("a") in a""".stripMargin diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspDefinitionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspDefinitionTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala index 422eb949f..c1d7a5b20 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspDefinitionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{GoToDefinitionResponse, Pos} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspDefinitionTest extends Rql2TruffleCompilerTestContext { +class LspDefinitionTest extends Rql2TruffleCompilerTestContext { test("go to definition identifier at usage test") { _ => val code = """let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspDotAutoCompleteTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspDotAutoCompleteTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala index fb271b685..5efc38ac5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspDotAutoCompleteTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{AutoCompleteResponse, FieldCompletion, PackageEntryCompletion, Pos} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspDotAutoCompleteTest extends Rql2TruffleCompilerTestContext { +class LspDotAutoCompleteTest extends Rql2TruffleCompilerTestContext { private def dotAutoCompleteTest(code: String, line: Int, col: Int, expectedFields: Seq[(String, String)]): Unit = { val AutoCompleteResponse(entries) = dotAutoComplete(code, Pos(line, col)) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspFormatCodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspFormatCodeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala index b1f9d2c31..70b82bfe9 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspFormatCodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api.FormatCodeResponse -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.FormatCodeResponse +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspFormatCodeTest extends Rql2TruffleCompilerTestContext { +class LspFormatCodeTest extends Rql2TruffleCompilerTestContext { def assertFormattedCode(code: String, expected: String) = { val FormatCodeResponse(Some(formattedCode)) = formatCode(code) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspHoverTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspHoverTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala index 59453cf7f..5f15b5215 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspHoverTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{HoverResponse, PackageCompletion, PackageEntryCompletion, Pos, TypeCompletion} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspHoverTest extends Rql2TruffleCompilerTestContext { +class LspHoverTest extends Rql2TruffleCompilerTestContext { test("hover identifier at definition test") { _ => val code = """let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspRenameTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspRenameTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala index 093afa981..91e9c537b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspRenameTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{Pos, RenameResponse} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspRenameTest extends Rql2TruffleCompilerTestContext { +class LspRenameTest extends Rql2TruffleCompilerTestContext { test("rename identifier at usage test") { _ => val code = """let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspValidateTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspValidateTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala index 4aa937cd6..04db951ef 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspValidateTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.ValidateResponse +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspValidateTest extends Rql2TruffleCompilerTestContext { +class LspValidateTest extends Rql2TruffleCompilerTestContext { test("validate simple code test") { _ => val code = """String.Lower("Hello")""".stripMargin diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspWordAutoCompleteTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspWordAutoCompleteTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala index 244321cfb..8d01c7309 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/lsp/LspWordAutoCompleteTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala @@ -10,13 +10,23 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.lsp +package com.rawlabs.snapi.compiler.tests.lsp -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{ + AutoCompleteResponse, + FieldCompletion, + FunParamCompletion, + LetBindCompletion, + LetFunCompletion, + LetFunRecCompletion, + PackageCompletion, + PackageEntryCompletion, + Pos, + TypeCompletion +} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LspWordAutoCompleteTest extends Rql2TruffleCompilerTestContext { +class LspWordAutoCompleteTest extends Rql2TruffleCompilerTestContext { private lazy val allTypes = Seq( ("byte", Some("")), diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/KryoPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/KryoPackageTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala index aaafaa67d..70c20f674 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/KryoPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class KryoPackageTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { private val cases = Table( @@ -40,7 +39,7 @@ class KryoPackageTest extends Rql2TruffleCompilerTestContext with TableDrivenPro test("all") { _ => forAll(cases) { (value, tpe) => - raw.utils.TestData(s"""let n: $tpe = $value in Kryo.Decode(Kryo.Encode(n), type $tpe)""") should evaluateTo(value) + TestData(s"""let n: $tpe = $value in Kryo.Decode(Kryo.Encode(n), type $tpe)""") should evaluateTo(value) } } diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapDatasets.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapDatasets.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala index 8bbcbed40..09617db9a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapDatasets.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext trait OffHeapDatasets { this: Rql2TruffleCompilerTestContext => diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapDistinctTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala index 6ce4803a3..264ba087c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class OffHeapDistinctTest extends Rql2TruffleCompilerTestContext { +class OffHeapDistinctTest extends Rql2TruffleCompilerTestContext { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "30kB") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapEquiJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapEquiJoinTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala index a305897ea..ab21cf9d2 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapEquiJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class OffHeapEquiJoinTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapEquiJoinTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapGroupTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapGroupTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala index 088a02628..acfd9b122 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapGroupTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class OffHeapGroupTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapGroupTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapJoinTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala index 8320face6..8e273b328 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class OffHeapJoinTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapJoinTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapOrderByTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala index a3f9df4c8..3c17e44bd 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/offheap/OffHeapOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.offheap +package com.rawlabs.snapi.compiler.tests.offheap -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class OffHeapOrderByTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapOrderByTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/BinaryOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala similarity index 85% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/output/BinaryOutputTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala index 0cce5ff50..0d6647ee1 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/BinaryOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala @@ -10,17 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.output +package com.rawlabs.snapi.compiler.tests.output import org.apache.commons.io.FileUtils -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import java.io.File import java.nio.file.Files -@TruffleTests class BinaryOutputTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class BinaryOutputTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { option("output-format", "binary") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/CsvOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/output/CsvOutputTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala index de6f22c7d..a91f93b7a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/CsvOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.output +package com.rawlabs.snapi.compiler.tests.output -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests -import raw.utils._ +import com.rawlabs.utils.core.RawUtils +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.utils.core._ import java.nio.file.Files -@TruffleTests class CsvOutputTest extends Rql2TruffleCompilerTestContext { +class CsvOutputTest extends Rql2TruffleCompilerTestContext { option("output-format", "csv") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/JsonOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/output/JsonOutputTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala index b2cca0c8c..247ac3650 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/JsonOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.output +package com.rawlabs.snapi.compiler.tests.output -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests -import raw.utils._ +import com.rawlabs.utils.core.RawUtils +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.core._ import java.nio.file.{Files, Path} -@TruffleTests class JsonOutputTest extends Rql2TruffleCompilerTestContext { +class JsonOutputTest extends Rql2TruffleCompilerTestContext { option("output-format", "json") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/TextOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/output/TextOutputTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala index cf10324a1..837c0e194 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/output/TextOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.output +package com.rawlabs.snapi.compiler.tests.output -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Files -@TruffleTests class TextOutputTest extends Rql2TruffleCompilerTestContext { +class TextOutputTest extends Rql2TruffleCompilerTestContext { option("output-format", "text") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/FrontendSyntaxAnalyzerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala similarity index 90% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/FrontendSyntaxAnalyzerTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala index 473d5d11d..d239e0fae 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/FrontendSyntaxAnalyzerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.parser +package com.rawlabs.snapi.compiler.tests.parser -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class FrontendSyntaxAnalyzerTest extends Rql2TruffleCompilerTestContext { +class FrontendSyntaxAnalyzerTest extends Rql2TruffleCompilerTestContext { // Internal node, not visible to the user parser. test(s"""$$package("Collection")""".stripMargin)(it => it shouldNot parse) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/ListSugarTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala similarity index 74% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/ListSugarTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala index b9b7f5e03..31fc94c28 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/ListSugarTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.parser +package com.rawlabs.snapi.compiler.tests.parser -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ListSugarTest extends Rql2TruffleCompilerTestContext { +class ListSugarTest extends Rql2TruffleCompilerTestContext { test("""[1,2,3]""") { it => it should typeAs("list(int)") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/OperatorPrecedenceTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/OperatorPrecedenceTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala index 311612b19..2b72c6bea 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/OperatorPrecedenceTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.parser +package com.rawlabs.snapi.compiler.tests.parser -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class OperatorPrecedenceTest extends Rql2TruffleCompilerTestContext { +class OperatorPrecedenceTest extends Rql2TruffleCompilerTestContext { test("""1+2*3""") { it => it should evaluateTo("(1+(2*3))") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/RecordSugarTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/RecordSugarTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala index aabc50e5f..c283dd02a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/parser/RecordSugarTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.parser +package com.rawlabs.snapi.compiler.tests.parser -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RecordSugarTest extends Rql2TruffleCompilerTestContext { +class RecordSugarTest extends Rql2TruffleCompilerTestContext { test("""{a: 1, b: "2"}""") { it => it should typeAs("record(a: int, b: string)") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10194Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10194Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala index 6a6784e67..42a60ecc6 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10194Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD10194Test extends Rql2TruffleCompilerTestContext { +class RD10194Test extends Rql2TruffleCompilerTestContext { private val q = """main(title: string = null, description: string = null, category: string = null, rating: string = null, actor: string = null) = diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10220Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala similarity index 85% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10220Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala index 8f96a89cb..6c77c468e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10220Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD10220Test extends Rql2TruffleCompilerTestContext { +class RD10220Test extends Rql2TruffleCompilerTestContext { test("""Csv.InferAndParse("stringData")""")( _ should (typeAs("collection(record(stringData: undefined))") and evaluateTo("[]")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10723Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala similarity index 73% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10723Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala index b96901d0e..2cffe5bef 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10723Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD10723Test extends Rql2TruffleCompilerTestContext { +class RD10723Test extends Rql2TruffleCompilerTestContext { private val qqq = "\"\"\"" test(s"""main() = diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10767Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10767Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala index 61060e389..2d4344ec0 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10767Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.client.api.{GetProgramDescriptionSuccess, ProgramEnvironment} -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils.SnapiInterpolator +import com.rawlabs.compiler.{GetProgramDescriptionSuccess, ProgramEnvironment} +import com.rawlabs.snapi.frontend.utils.SnapiInterpolator +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext class RD10767Test extends Rql2TruffleCompilerTestContext { private val data = tempFile(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10801Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10801Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala index 8c12e029d..28c8bcfd5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD10801Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils.SnapiInterpolator -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils.SnapiInterpolator +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD10801Test extends Rql2TruffleCompilerTestContext { +class RD10801Test extends Rql2TruffleCompilerTestContext { private val qqq = "\"\"\"" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD3742Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala similarity index 84% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD3742Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala index ca083642a..c91c2625c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD3742Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD3742Test extends Rql2TruffleCompilerTestContext { +class RD3742Test extends Rql2TruffleCompilerTestContext { val triple = "\"\"\"" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD3784Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD3784Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala index fdcb143fd..0d93803df 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD3784Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD3784Test extends Rql2TruffleCompilerTestContext { +class RD3784Test extends Rql2TruffleCompilerTestContext { private val data = tempFile( """v diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD4529Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala similarity index 83% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD4529Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala index 34873cf5a..5bcb9f698 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD4529Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD4529Test extends Rql2TruffleCompilerTestContext { +class RD4529Test extends Rql2TruffleCompilerTestContext { test(""" |let a: float = 1.0f diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD4981Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD4981Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala index 8ba2a798f..e9c836fb0 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD4981Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class RD4981Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class RD4981Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test(snapi"""let | data = Csv.InferAndRead("$airportsLocal"), diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5238Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala similarity index 71% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5238Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala index 8a7112424..c3332f3e3 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5238Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class RD5238Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class RD5238Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test(snapi""" |let region1 = Csv.InferAndRead("$tpchRegionCsvLocal"), diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5365Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5365Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala index 90beee77a..705c434f9 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5365Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala @@ -10,17 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions +import com.rawlabs.utils.core.TestData import org.bitbucket.inkytonik.kiama.util.Positions import org.scalatest.matchers.{MatchResult, Matcher} -import raw.utils.TestData -import raw.compiler.rql2.FrontendSyntaxAnalyzer -import raw.compiler.rql2.source.SourcePrettyPrinter -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzer +import com.rawlabs.snapi.frontend.rql2.source.SourcePrettyPrinter +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5365Test extends Rql2TruffleCompilerTestContext { +class RD5365Test extends Rql2TruffleCompilerTestContext { private class PrettyPrintAs(expected: String) extends Matcher[TestData] { override def apply(query: TestData): MatchResult = { diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5393Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5393Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala index 60cdf9ebd..1362c0fcf 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5393Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.errors.CannotDetermineTypeOfParameter -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.errors.CannotDetermineTypeOfParameter +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5393Test extends Rql2TruffleCompilerTestContext { +class RD5393Test extends Rql2TruffleCompilerTestContext { test("""main(country: string = null,code: string = null) = | let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5412Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5412Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala index b22aaf53c..b607d6942 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5412Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5412Test extends Rql2TruffleCompilerTestContext { +class RD5412Test extends Rql2TruffleCompilerTestContext { test("""let | json_type = type record(creation_date: string, entries: list(string)), diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5448Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5448Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala index d0757e364..ac8a0a6b5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5448Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5448Test extends Rql2TruffleCompilerTestContext { +class RD5448Test extends Rql2TruffleCompilerTestContext { private val ttt = "\"\"\"" private val jsonString = """[ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5484Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5484Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala index a83bc5d7a..6dc0b9ee1 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5484Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5484Test extends Rql2TruffleCompilerTestContext { +class RD5484Test extends Rql2TruffleCompilerTestContext { // top-level and correct. test("""Timestamp.Build(2015, 1, 4, 22, 0)""")(_ should run) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5488Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5488Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala index 0b0d5736a..595e7ab8b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5488Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5488Test extends Rql2TruffleCompilerTestContext { +class RD5488Test extends Rql2TruffleCompilerTestContext { // All these tests are valid queries. They fail in the middle of compilation, at L0, with "lines is declared more than once". diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5491Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5491Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala index 668b5cc50..7cf8648ba 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5491Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5491Test extends Rql2TruffleCompilerTestContext { +class RD5491Test extends Rql2TruffleCompilerTestContext { test(s"""let | query = \"\"\"SELECT (?item as ?cat) ?itemLabel diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5644Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5644Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala index 7db042578..5206fecea 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5644Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5644Test extends Rql2TruffleCompilerTestContext { +class RD5644Test extends Rql2TruffleCompilerTestContext { // Basic reference behavior. The function parameter isn't type and inherits the list item type. Everything matches. test(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5679Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5679Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala index d50c818a6..14124a4fa 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5679Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5679Test extends Rql2TruffleCompilerTestContext { +class RD5679Test extends Rql2TruffleCompilerTestContext { // regular XML file (types as record) with a list inside private val xml = tempFile(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5685Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala similarity index 81% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5685Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala index 9c4680be7..e440a639a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5685Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5685Test extends Rql2TruffleCompilerTestContext { +class RD5685Test extends Rql2TruffleCompilerTestContext { test("""let itemType = type int, | listType = type list(itemType), diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5691Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5691Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala index cbb1e4502..3128f7226 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5691Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -@TruffleTests class RD5691Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class RD5691Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { test(s""" |let issueType = type record( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5697Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala similarity index 83% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5697Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala index 699d375cc..a122a110c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5697Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class RD5697Test extends Rql2TruffleCompilerTestContext { +class RD5697Test extends Rql2TruffleCompilerTestContext { private val jsonFile = tempFile("""{"a": 12, "b": 14}""") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5714Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5714Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala index aadbcdfc4..04afdb38e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5714Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions import java.nio.file.Files -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import scala.io.Source -@TruffleTests class RD5714Test extends Rql2TruffleCompilerTestContext { +class RD5714Test extends Rql2TruffleCompilerTestContext { test("""let colA = [{id: 1, name: "john"}], | colB = [{id: 2, firstName: "john"}], diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5722Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala similarity index 74% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5722Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala index b753605db..d258e4364 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5722Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5722Test extends Rql2TruffleCompilerTestContext { +class RD5722Test extends Rql2TruffleCompilerTestContext { test("""let data = Collection.Build({ | a: { b: 123} diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD572Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD572Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala index 4ce0ead02..3b1d82f84 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD572Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD572Test extends Rql2TruffleCompilerTestContext { +class RD572Test extends Rql2TruffleCompilerTestContext { test("-128b") { it => it should typeAs("byte") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5775Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5775Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala index a543943b5..96dd0a95a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5775Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5775Test extends Rql2TruffleCompilerTestContext { +class RD5775Test extends Rql2TruffleCompilerTestContext { test("""let data = Http.Get("https://jira.atlassian.com/rest/api/latest/search", args=[{"jql", "fixVersion=9.0.0"}]), | r = Json.InferAndRead(data), | issues = Collection.Transform(r.issues, i -> { diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5779Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala similarity index 85% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5779Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala index 05ac9db29..002eb1f56 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5779Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Path -@TruffleTests class RD5779Test extends Rql2TruffleCompilerTestContext { +class RD5779Test extends Rql2TruffleCompilerTestContext { val data: Path = tempFile("""[ | {"a": 1, "b": 10} |]""".stripMargin) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5784Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala similarity index 74% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5784Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala index 598a5a7f6..2891e00a8 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5784Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class RD5784Test extends Rql2TruffleCompilerTestContext { +class RD5784Test extends Rql2TruffleCompilerTestContext { private val xmlFile = tempFile(""" | diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5785Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala similarity index 81% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5785Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala index 7404e19b5..8e3344bfb 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5785Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5785Test extends Rql2TruffleCompilerTestContext { +class RD5785Test extends Rql2TruffleCompilerTestContext { // The only way of this returning true is if all values in the list are the same. // Almost impossible with 5 random values. diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5786Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala similarity index 85% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5786Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala index 5de62e286..f7fa98461 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5786Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5786Test extends Rql2TruffleCompilerTestContext { +class RD5786Test extends Rql2TruffleCompilerTestContext { test("""true == false""") { _ should evaluateTo(""" false """) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5851Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5851Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala index 7cc8ac528..10ab21ce0 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5851Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala @@ -10,13 +10,24 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions - -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +package com.rawlabs.snapi.compiler.tests.regressions + +import com.rawlabs.compiler.{ + AutoCompleteResponse, + Completion, + FieldCompletion, + FunParamCompletion, + LetBindCompletion, + LetFunCompletion, + LetFunRecCompletion, + PackageCompletion, + PackageEntryCompletion, + Pos, + TypeCompletion +} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5851Test extends Rql2TruffleCompilerTestContext { +class RD5851Test extends Rql2TruffleCompilerTestContext { def autoCompleteNames(entries: Array[Completion]): Seq[String] = { entries.map { diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5884Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala similarity index 83% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5884Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala index 2bd494147..4d678dc4e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5884Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5884Test extends Rql2TruffleCompilerTestContext { +class RD5884Test extends Rql2TruffleCompilerTestContext { test("""let f(x: int, y: int = 12) = 3.14 + x + y |in f(1)""".stripMargin)(_ should run) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5893Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5893Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala index 8fe399622..c73e9be2f 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5893Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5893Test extends Rql2TruffleCompilerTestContext { +class RD5893Test extends Rql2TruffleCompilerTestContext { // this has a list of text private val data = tempFile(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5914Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala similarity index 79% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5914Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala index 891850718..87e71c016 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5914Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5914Test extends Rql2TruffleCompilerTestContext { +class RD5914Test extends Rql2TruffleCompilerTestContext { test("""let item1 = {name: "coffee machine", price: 200, price: 199}, // price is duplicated, price is an int | item2 = {name: "coffee machine", price: 200.00, price: 199.99} // price is duplicated, price is a double diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5920Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5920Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala index 5cd93fb87..43cbd174b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5920Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5920Test extends Rql2TruffleCompilerTestContext { +class RD5920Test extends Rql2TruffleCompilerTestContext { test("""let f(x: int) = x * 10 |in f(10)""".stripMargin)(_ should evaluateTo("100")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5921Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5921Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala index 4539281ae..dd1a859ad 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5921Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5921Test extends Rql2TruffleCompilerTestContext { +class RD5921Test extends Rql2TruffleCompilerTestContext { val data1 = tempFile("""1 |2 diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5925Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5925Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala index 5c7d24a08..4e76986ef 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5925Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5925Test extends Rql2TruffleCompilerTestContext { +class RD5925Test extends Rql2TruffleCompilerTestContext { test("""let c = Collection.Build(1, 2, 3, 4) |in Collection.Filter(c, s -> null)""".stripMargin) { it => diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala similarity index 84% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5932Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala index 774410959..f1964f2b9 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5932Test extends Rql2TruffleCompilerTestContext { +class RD5932Test extends Rql2TruffleCompilerTestContext { val data = tempFile("""[ | {"id": 1, "network_interface": "eni-08b85cc07294f82bf"}, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5968Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5968Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala index 3acc73efd..bc36a4bdf 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5968Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5968Test extends Rql2TruffleCompilerTestContext { +class RD5968Test extends Rql2TruffleCompilerTestContext { private val cdataFile = tempFile(""" | diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5971Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5971Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala index 65153b606..aba2c15ee 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5971Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5971Test extends Rql2TruffleCompilerTestContext { +class RD5971Test extends Rql2TruffleCompilerTestContext { // error when type isn't supported test(s"""[{a: "binary", b: [1,2,3,4]}]""") { it => diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5979Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala similarity index 78% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5979Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala index d4b514d3f..912b25304 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD5979Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5979Test extends Rql2TruffleCompilerTestContext { +class RD5979Test extends Rql2TruffleCompilerTestContext { test("""[{a: 12, b: 14}, {c: 23, d: 54}]""")(_ should runErrorAs("expected compatible with")) test("""[{a: 12, b: 14}, {a: 23, d: 54}]""")(_ should runErrorAs("expected compatible with")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD7924Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala similarity index 81% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD7924Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala index b7a9bfd4a..ab07eb477 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD7924Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Path -@TruffleTests class RD7924Test extends Rql2TruffleCompilerTestContext { +class RD7924Test extends Rql2TruffleCompilerTestContext { val string: Path = tempFile(""" "Hello!" """) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD7974Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD7974Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala index 6a6967a3c..1d1991055 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD7974Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions +import com.rawlabs.utils.core.RawUtils import org.scalatest.BeforeAndAfterEach -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests -import raw.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.core._ import java.nio.file.Files -@TruffleTests class RD7974Test extends Rql2TruffleCompilerTestContext with BeforeAndAfterEach { +class RD7974Test extends Rql2TruffleCompilerTestContext with BeforeAndAfterEach { private val tmpFile = Files.createTempFile("csv-output-test", ".csv") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8530Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8530Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala index 087c1aa9a..8b285de4c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8530Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions import org.scalatest.BeforeAndAfterEach -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD8530Test extends Rql2TruffleCompilerTestContext with BeforeAndAfterEach { +class RD8530Test extends Rql2TruffleCompilerTestContext with BeforeAndAfterEach { test("""List.Filter([1,2,3,4], n -> n > 2, a = 12)""".stripMargin)( _ should typeErrorAs("no optional arguments expected") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8764Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8764Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala index 31271b42e..73d48278c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8764Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions import com.typesafe.scalalogging.StrictLogging -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD8764Test extends Rql2TruffleCompilerTestContext with StrictLogging { +class RD8764Test extends Rql2TruffleCompilerTestContext with StrictLogging { test(""" |let f: (record(_1: int, _2: int)) -> bool = (x: int, y: int) -> x == y diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8935Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8935Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala index a928b1976..34204e1bd 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8935Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD8935Test extends Rql2TruffleCompilerTestContext { +class RD8935Test extends Rql2TruffleCompilerTestContext { private val vowels = tempFile("""a |e diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8993Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8993Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala index 136961c17..014ee5779 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD8993Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD8993Test extends Rql2TruffleCompilerTestContext { +class RD8993Test extends Rql2TruffleCompilerTestContext { test("""apply(f: int -> bool) = f(1) |apply((x: int) -> true)""".stripMargin)(_ should evaluateTo("true")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9137Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala similarity index 92% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9137Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala index 73f9bd406..cca556891 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9137Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions import com.typesafe.scalalogging.StrictLogging -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9137Test extends Rql2TruffleCompilerTestContext with StrictLogging { +class RD9137Test extends Rql2TruffleCompilerTestContext with StrictLogging { test("""Json.InferAndRead("https://raw-tutorial.s3.eu-west-1.amazonaws.com/patients.json")""".stripMargin)( _ should run diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9228Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9228Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala index a6a22cd16..bb3e9547c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9228Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9228Test extends Rql2TruffleCompilerTestContext { +class RD9228Test extends Rql2TruffleCompilerTestContext { // pass a plain URL. It will be turned into a location, directly passed as a parameter. test(""" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9229Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala similarity index 84% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9229Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala index 081b2fe43..5a374246f 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9229Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9229Test extends Rql2TruffleCompilerTestContext { +class RD9229Test extends Rql2TruffleCompilerTestContext { test(s"""[{a: "binary", b: [1,2,3,4]}]""") { it => option("output-format", "binary") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9255Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9255Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala index b82c61f9e..c29d038c3 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9255Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala @@ -10,16 +10,31 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions +import com.rawlabs.compiler.{ + RawBool, + RawByte, + RawDate, + RawDecimal, + RawDouble, + RawFloat, + RawInt, + RawInterval, + RawLong, + RawNull, + RawShort, + RawString, + RawTime, + RawTimestamp, + RawValue +} import org.scalatest.EitherValues -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.time.{Duration, LocalDate, LocalDateTime, LocalTime} -@TruffleTests class RD9255Test extends Rql2TruffleCompilerTestContext with EitherValues { +class RD9255Test extends Rql2TruffleCompilerTestContext with EitherValues { private val declarations = """ |string_func(x: string) = String.Length(x) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9359Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala similarity index 90% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9359Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala index 767eedb5d..c1be35863 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9359Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.utils._ import java.nio.file.{Files, Path} -@TruffleTests class RD9359Test extends Rql2TruffleCompilerTestContext { +class RD9359Test extends Rql2TruffleCompilerTestContext { private val duplicateCsvString = """a,b,a |1,2,3 diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9409Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala similarity index 83% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9409Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala index d1a0e24dd..61107220c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9409Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.client.api._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.compiler.{HoverResponse, Pos, TypeCompletion} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9409Test extends Rql2TruffleCompilerTestContext { +class RD9409Test extends Rql2TruffleCompilerTestContext { test("""let | a = 1, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9445Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9445Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala index ac7018dc7..6293590b7 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9445Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala @@ -10,17 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions +import com.rawlabs.utils.core.TestData import org.scalatest.matchers.{MatchResult, Matcher} -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext import java.nio.file.Files import scala.io.Source -@TruffleTests class RD9445Test extends Rql2TruffleCompilerTestContext { +class RD9445Test extends Rql2TruffleCompilerTestContext { def outputAs(expected: String, format: String = "json") = new OutputAs(expected, format) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9479Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala similarity index 73% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9479Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala index 8b85ba70f..d4ea1e1cb 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9479Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9479Test extends Rql2TruffleCompilerTestContext { +class RD9479Test extends Rql2TruffleCompilerTestContext { private val recordData = tempFile("""[{"a": 1, "b": 10, "c": 100}]""") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9485Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9485Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala index 711674a44..39eafb9af 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9485Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9485Test extends Rql2TruffleCompilerTestContext { +class RD9485Test extends Rql2TruffleCompilerTestContext { - property("raw.inferrer.local.xml.sample-size", "2") + property("raw.snapi.frontend.inferrer.local.xml.sample-size", "2") val xmlList = tempFile(""" | diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9554Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9554Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala index 4b72bb27a..1a8a9210b 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9554Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9554Test extends Rql2TruffleCompilerTestContext { +class RD9554Test extends Rql2TruffleCompilerTestContext { test("""let range = Int.Range(0,5) |in Collection.Union(range, range)""".stripMargin) { it => diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9616Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9616Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala index 4fef98532..c7f75019d 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9616Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9616Test extends Rql2TruffleCompilerTestContext { +class RD9616Test extends Rql2TruffleCompilerTestContext { test( """let diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala similarity index 78% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9932Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala index 21c48ec40..d110434fa 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/RD9932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions +package com.rawlabs.snapi.compiler.tests.regressions -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD9932Test extends Rql2TruffleCompilerTestContext { +class RD9932Test extends Rql2TruffleCompilerTestContext { val ttt = "\"\"\"" test(s"""Json.Parse( diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD3084Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD3084Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala index b8eebf7df..1f54c6ed4 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD3084Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions.credentials +package com.rawlabs.snapi.compiler.tests.regressions.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD3084Test extends Rql2TruffleCompilerTestContext { +class RD3084Test extends Rql2TruffleCompilerTestContext { rdbms("mysql-test", TestCredentials.mysqlCreds) rdbms("postgres-test", TestCredentials.pgsqlCreds) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala similarity index 71% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala index 7c0cab651..2e98de53a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD4445Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala @@ -10,17 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions.credentials +package com.rawlabs.snapi.compiler.tests.regressions.credentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.protocol.DropboxAccessTokenConfig -import raw.testing.tags.TruffleTests +import com.rawlabs.protocol.compiler.DropboxAccessTokenConfig +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD4445Test extends Rql2TruffleCompilerTestContext { +class RD4445Test extends Rql2TruffleCompilerTestContext { - import raw.compiler.rql2.tests.TestCredentials._ + import com.rawlabs.snapi.compiler.tests.TestCredentials._ - property("raw.sources.dropbox.clientId", dropboxClientId) + property("raw.utils.sources.dropbox.clientId", dropboxClientId) dropbox("rawlabs-dropbox", DropboxAccessTokenConfig.newBuilder().setAccessToken(dropboxLongLivedAccessToken).build()) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD5932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala similarity index 67% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD5932Test.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala index bd1a24738..14656dab6 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/regressions/credentials/RD5932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.regressions.credentials +package com.rawlabs.snapi.compiler.tests.regressions.credentials -import raw.compiler.rql2.tests.TestCredentials -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.tests.TestCredentials +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class RD5932Test extends Rql2TruffleCompilerTestContext { +class RD5932Test extends Rql2TruffleCompilerTestContext { s3Bucket(TestCredentials.UnitTestPrivateBucket, TestCredentials.UnitTestPrivateBucketCred) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BasicStagedCompilerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BasicStagedCompilerTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala index 34a81721b..56c412eb3 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BasicStagedCompilerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BasicStagedCompilerTest extends Rql2TruffleCompilerTestContext { +class BasicStagedCompilerTest extends Rql2TruffleCompilerTestContext { test("""TestPackage.ByteValueArg(22b)""")(_ should evaluateTo("{arg: 22b}")) test("""TestPackage.ShortValueArg(22s)""")(_ should evaluateTo("{arg: 22s}")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpAndTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpAndTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala index 1a8e34115..d7e89e496 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpAndTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpAndTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class BinaryExpAndTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { test("""true and true""")(_ should evaluateTo("true")) test("""true and false""")(_ should evaluateTo("false")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpDivTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpDivTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala index 76622e9b4..2569467d5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpDivTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpDivTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpDivTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("""4 / 2""") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpEqTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpEqTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala index e995c99ae..9517ed134 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpEqTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpEqTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpEqTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("1 == 1")(it => it should evaluateTo("true")) test("1 == 2")(it => it should evaluateTo("false")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpGeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpGeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala index c360c51c7..75ffc764e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpGeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests -import raw.utils.TestData +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpGeTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpGeTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("1 >= 1")(it => it should evaluateTo("true")) test("1 >= 2")(it => it should evaluateTo("false")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpGtTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpGtTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala index 24e348673..12129da5e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpGtTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpGtTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpGtTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("1 > 1")(it => it should evaluateTo("false")) test("1 > 2")(it => it should evaluateTo("false")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpLeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpLeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala index 176fd3e39..76e14a455 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpLeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpLeTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpLeTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("1 <= 1")(it => it should evaluateTo("true")) test("1 <= 2")(it => it should evaluateTo("true")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpLtTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpLtTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala index ce708d5a9..1f60ebbd5 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpLtTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpLtTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpLtTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("1 < 1")(it => it should evaluateTo("false")) test("1 < 2")(it => it should evaluateTo("true")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpModTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpModTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala index fa8b33327..27f7a2c61 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpModTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpModTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpModTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("""5 % 3""") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpMultTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpMultTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala index ac72e189f..97cbfa809 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpMultTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpMultTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpMultTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("""1 * 1""") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpNeqTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala similarity index 96% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpNeqTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala index 38856f8d3..e73208926 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpNeqTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpNeqTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpNeqTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("1 != 1")(it => it should evaluateTo("false")) test("1 != 2")(it => it should evaluateTo("true")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpOrTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala similarity index 91% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpOrTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala index 1eca03e88..984a71c82 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpOrTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpOrTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class BinaryExpOrTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { test("""true or true""")(_ should evaluateTo("true")) test("""true or false""")(_ should evaluateTo("true")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpPlusTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpPlusTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala index 5ea87266b..6b9f1e23a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpPlusTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpPlusTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpPlusTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("""1 + 1""") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpSubTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpSubTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala index 0eeb6db46..ee9709adb 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/BinaryExpSubTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class BinaryExpSubTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpSubTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("""1 - 1""") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ClosureTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ClosureTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala index 010014f16..ede2f6084 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ClosureTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ClosureTest extends Rql2TruffleCompilerTestContext { +class ClosureTest extends Rql2TruffleCompilerTestContext { test("""let functions = | List.Transform([1,2,3], diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/CombinationSpecTestHelper.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/CombinationSpecTestHelper.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/CombinationSpecTestHelper.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/CombinationSpecTestHelper.scala index 651930bcd..995513bda 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/CombinationSpecTestHelper.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/CombinationSpecTestHelper.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec import org.scalatest.prop.TableDrivenPropertyChecks diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ConstTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala similarity index 89% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ConstTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala index 827ba07b2..e9bcc050c 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ConstTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.utils.TestData -import raw.compiler.rql2.source.{Rql2BoolType, Rql2IntType, Rql2StringType} -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.source.{Rql2BoolType, Rql2IntType, Rql2StringType} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ConstTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class ConstTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { test("1") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ErrorsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ErrorsTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala index de037490f..005a14a41 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ErrorsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ErrorsTest extends Rql2TruffleCompilerTestContext { +class ErrorsTest extends Rql2TruffleCompilerTestContext { test("""Collection.Count("a")""")(_ shouldNot tipe) test("""Collection.Count(Collection.Count("a"))""")(_ shouldNot tipe) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/FunAbsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/FunAbsTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala index 30152a0c3..8e1ec8e73 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/FunAbsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class FunAbsTest extends Rql2TruffleCompilerTestContext { +class FunAbsTest extends Rql2TruffleCompilerTestContext { test(""" |let f = (v: int) -> v + 1 diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/IfThenElseTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/IfThenElseTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala index 8d1955312..fdb35eb4e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/IfThenElseTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class IfThenElseTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class IfThenElseTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test(""" |if true then "a" else "b" diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ImplicitCastTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ImplicitCastTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala index c0bfeddd8..7e4197e15 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ImplicitCastTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ImplicitCastTest extends Rql2TruffleCompilerTestContext { +class ImplicitCastTest extends Rql2TruffleCompilerTestContext { // compatible options as function param test(s"""let f = (x: int) -> Record.Build(o = x) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/JoinWithTryRowsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala similarity index 93% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/JoinWithTryRowsTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala index f06302046..bf9a98612 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/JoinWithTryRowsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.compiler.utils._ -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext +import com.rawlabs.snapi.frontend.utils._ -@TruffleTests class JoinWithTryRowsTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class JoinWithTryRowsTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { /* testing joins with failed rows. How a dataset of failed rows is built: by engineering a dataset of nested list of records, and pick one using List.Get so that it sometimes diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetBindTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala similarity index 95% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetBindTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala index 911ec5525..e224d67b3 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetBindTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.utils.core.TestData +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LetBindTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class LetBindTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { test("""let x = 1 |in x diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetFunRecTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala similarity index 87% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetFunRecTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala index cdc670b82..e1c12dfde 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetFunRecTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.errors.OutputTypeRequiredForRecursiveFunction -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.errors.OutputTypeRequiredForRecursiveFunction +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LetFunRecTest extends Rql2TruffleCompilerTestContext { +class LetFunRecTest extends Rql2TruffleCompilerTestContext { test("""let rec fact(v: int): int = if (v > 1) then v * fact(v - 1) else v |in fact(4) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetFunTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala similarity index 97% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetFunTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala index 33f2cbc58..450d44aa4 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetFunTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LetFunTest extends Rql2TruffleCompilerTestContext { +class LetFunTest extends Rql2TruffleCompilerTestContext { test("""let f(x: int) = x + 1 |in f(0) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetTypeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala similarity index 86% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetTypeTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala index 8f49a4cb6..835ec1f62 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/LetTypeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class LetTypeTest extends Rql2TruffleCompilerTestContext { +class LetTypeTest extends Rql2TruffleCompilerTestContext { test(""" |let t = type int, diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/MigrationTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/MigrationTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala index 7ff920471..4473c5881 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/MigrationTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala @@ -10,13 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.source.{Rql2IntType, Rql2IsNullableTypeProperty, Rql2IsTryableTypeProperty, Rql2UndefinedType} -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.rql2.source.{ + Rql2IntType, + Rql2IsNullableTypeProperty, + Rql2IsTryableTypeProperty, + Rql2UndefinedType +} +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class MigrationTest extends Rql2TruffleCompilerTestContext { +class MigrationTest extends Rql2TruffleCompilerTestContext { test("1") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/PackageNameTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/PackageNameTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala index b3271cc39..8c589c15e 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/PackageNameTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class PackageNameTest extends Rql2TruffleCompilerTestContext { +class PackageNameTest extends Rql2TruffleCompilerTestContext { test("""Record""")(it => it should typeAs("""package("Record")""")) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ProjTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ProjTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala index 3cd211759..21929eb2d 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/ProjTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class ProjTest extends Rql2TruffleCompilerTestContext { +class ProjTest extends Rql2TruffleCompilerTestContext { test("""let a = {x: 1} |in a.x diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/PropagationTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala similarity index 98% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/PropagationTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala index 7289e3786..d7775c14a 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/PropagationTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class PropagationTest extends Rql2TruffleCompilerTestContext { +class PropagationTest extends Rql2TruffleCompilerTestContext { // lists test("""let l = List.Build(1,2,3,2,1) |in TestPackage.StrictArgs(l)""".stripMargin)(_ should (typeAs("float") and evaluateTo("5.0f"))) diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/StagedCompilerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/StagedCompilerTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala index c03325c9d..91c63bd8d 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/StagedCompilerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec -import raw.compiler.utils._ -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class StagedCompilerTest extends Rql2TruffleCompilerTestContext { +class StagedCompilerTest extends Rql2TruffleCompilerTestContext { val data = tempFile(""" |[ diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/UnaryExpNegTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/UnaryExpNegTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala index f9d6f630a..822f8b492 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/UnaryExpNegTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class UnaryExpNegTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class UnaryExpNegTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { test("- 1") { it => it should typeAs("int") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/UnaryExpNotTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala similarity index 88% rename from snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/UnaryExpNotTest.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala index 93f8fe7ce..9c40273b3 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/tests/spec/UnaryExpNotTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala @@ -10,14 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.tests.spec +package com.rawlabs.snapi.compiler.tests.spec +import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import raw.utils.TestData -import raw.compiler.rql2.truffle.Rql2TruffleCompilerTestContext -import raw.testing.tags.TruffleTests +import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -@TruffleTests class UnaryExpNotTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class UnaryExpNotTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { test("""not true""".stripMargin) { it => it should typeAs("bool") it should evaluateTo("false") diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/truffle/Rql2TruffleCompilerServiceTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerServiceTestContext.scala similarity index 94% rename from snapi-client/src/test/scala/raw/compiler/rql2/truffle/Rql2TruffleCompilerServiceTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerServiceTestContext.scala index 893fa2fac..e87a956cc 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/truffle/Rql2TruffleCompilerServiceTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerServiceTestContext.scala @@ -10,12 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.truffle +package com.rawlabs.snapi.compiler.truffle +import com.rawlabs.utils.core.{RawTestSuite, RawUtils, SettingsTestContext} import org.graalvm.polyglot.Engine -import raw.client.rql2.truffle.Rql2TruffleCompilerService -import raw.compiler.rql2.api.Rql2CompilerServiceTestContext -import raw.utils.{RawTestSuite, RawUtils, SettingsTestContext} +import com.rawlabs.snapi.compiler.{Rql2CompilerServiceTestContext, Rql2TruffleCompilerService} trait Rql2TruffleCompilerServiceTestContext extends Rql2CompilerServiceTestContext { this: RawTestSuite with SettingsTestContext => diff --git a/snapi-client/src/test/scala/raw/compiler/rql2/truffle/Rql2TruffleCompilerTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala similarity index 82% rename from snapi-client/src/test/scala/raw/compiler/rql2/truffle/Rql2TruffleCompilerTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala index 8a70139c5..c22d93f43 100644 --- a/snapi-client/src/test/scala/raw/compiler/rql2/truffle/Rql2TruffleCompilerTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.truffle +package com.rawlabs.snapi.compiler.truffle -import raw.compiler.rql2.tests.Rql2CompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2CompilerTestContext trait Rql2TruffleCompilerTestContext extends Rql2CompilerTestContext with Rql2TruffleCompilerServiceTestContext diff --git a/snapi-frontend/src/main/java/module-info.java b/snapi-frontend/src/main/java/module-info.java index 478ad7569..e8c0a09da 100644 --- a/snapi-frontend/src/main/java/module-info.java +++ b/snapi-frontend/src/main/java/module-info.java @@ -37,30 +37,30 @@ requires com.google.common; requires jul.to.slf4j; requires org.graalvm.polyglot; - requires raw.utils; - requires raw.protocol; - requires raw.client; - requires raw.sources; + requires raw.utils.core; + requires raw.protocol.compiler; + requires raw.compiler; + requires raw.utils.sources; requires raw.snapi.parser; - exports raw.compiler.base; - exports raw.compiler.base.errors; - exports raw.compiler.base.source; - exports raw.compiler.common; - exports raw.compiler.common.source; - exports raw.compiler.rql2; - exports raw.compiler.rql2.api; - exports raw.compiler.rql2.builtin; - exports raw.compiler.rql2.errors; - exports raw.compiler.rql2.lsp; - exports raw.compiler.rql2.source; - exports raw.compiler.rql2.antlr4; - exports raw.compiler.utils; - exports raw.inferrer.api; - exports raw.inferrer.local; + exports com.rawlabs.snapi.frontend.base; + exports com.rawlabs.snapi.frontend.base.errors; + exports com.rawlabs.snapi.frontend.base.source; + exports com.rawlabs.snapi.frontend.common; + exports com.rawlabs.snapi.frontend.common.source; + exports com.rawlabs.snapi.frontend.rql2; + exports com.rawlabs.snapi.frontend.rql2.api; + exports com.rawlabs.snapi.frontend.rql2.builtin; + exports com.rawlabs.snapi.frontend.rql2.errors; + exports com.rawlabs.snapi.frontend.rql2.lsp; + exports com.rawlabs.snapi.frontend.rql2.source; + exports com.rawlabs.snapi.frontend.rql2.antlr4; + exports com.rawlabs.snapi.frontend.utils; + exports com.rawlabs.snapi.frontend.inferrer.api; + exports com.rawlabs.snapi.frontend.inferrer.local; - opens raw.inferrer.api to + opens com.rawlabs.snapi.frontend.inferrer.api to com.fasterxml.jackson.databind; - opens raw.compiler.rql2.api to + opens com.rawlabs.snapi.frontend.rql2.api to com.fasterxml.jackson.databind; } diff --git a/snapi-frontend/src/main/resources/reference.conf b/snapi-frontend/src/main/resources/reference.conf index 253a6ffd3..52416a441 100644 --- a/snapi-frontend/src/main/resources/reference.conf +++ b/snapi-frontend/src/main/resources/reference.conf @@ -1,75 +1,49 @@ -raw { +raw.snapi.frontend { check-syntax-analyzers = false -} -raw { - compiler { - output-format = "hjson" - windows-line-ending = false - skip-phases = [] - jvm { - compilation-timeout = 300 s - } - scala2 { - # Settings used to compile queries, same format as if passed to scalac in the command line - # https://docs.scala-lang.org/overviews/compiler-options/index.html#introduction - # See scalac -opt:help for possible values. - - # (msb): I think these make more sense, but keeping the "old ones" for now. - #settings = "-opt:inline:raw.runtime.**,inline:raw.query.**" - settings = "-opt:unreachable-code,box-unbox,simplify-jumps,redundant-casts,copy-propagation" - - classpath = [] - compilation-directory = ${java.io.tmpdir}"/raw-compilation" - pretty-print-code = true - # Maximum number of classes to load on startup. If more than this limit is reached, delete code cache. - # Use 0 to always delete code cache and start fresh. - # Use -1 for no limit. - max-classes-on-startup = 0 + inferrer { + # Number of inferrer threads. + thread-pool-size = 8 + # Number of entries in the inferrer cache. + cache-size = 100 + # Timeout for an inference request. + timeout = 30s + # Time after which an inferrer cache entry expires if it is not accessed! + expiry = 30s + + local { + # Number of files to sample while inferring wildcards or folders. Use -1 for all. + sample-files = 10 + + encoding-detection-read-size = 1M + + csv { + sample-size = 10000 + # How many lines to use to guess the separator + separator-sample-size = 100 + # Weight for quoted values when choosing delimiter in csv files + # 0.3 is a magic number, it was chosen so test "delimiter comas in quotes" works + quoted-weight = 3.0 + } + + hjson { + sample-size = 10000 + } + + json { + sample-size = 10000 + } + + text { + sample-size = 10000 + } + + xml { + sample-size = 10000 + } + + # Buffered seekable input stream can be used for text-based formats. + use-buffered-seekable-is = true } } -} -raw.inferrer { - # Number of inferrer threads. - thread-pool-size = 8 - # Number of entries in the inferrer cache. - cache-size = 100 - # Timeout for an inference request. - timeout = 30s - # Time after which an inferrer cache entry expires if it is not accessed! - expiry = 30s -} -raw.inferrer.local { - # Number of files to sample while inferring wildcards or folders. Use -1 for all. - sample-files = 10 - - encoding-detection-read-size = 1M - - csv { - sample-size = 10000 - # How many lines to use to guess the separator - separator-sample-size = 100 - # Weight for quoted values when choosing delimiter in csv files - # 0.3 is a magic number, it was chosen so test "delimiter comas in quotes" works - quoted-weight = 3.0 - } - - hjson { - sample-size = 10000 - } - - json { - sample-size = 10000 - } - - text { - sample-size = 10000 - } - - xml { - sample-size = 10000 - } - - # Buffered seekable input stream can be used for text-based formats. - use-buffered-seekable-is = true } \ No newline at end of file diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/BaseTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala similarity index 88% rename from snapi-frontend/src/main/scala/raw/compiler/base/BaseTree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala index 75c763ad7..ddd0ff499 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/BaseTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base +import com.rawlabs.compiler.Message import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.relation.{EnsureTree, LeaveAlone, TreeRelation} -import raw.client.api.Message -import raw.compiler.base.errors.{CompilationMessageMapper, ErrorCompilerMessage} -import raw.compiler.base.source._ -import raw.compiler.utils.ExtraRewriters +import com.rawlabs.snapi.frontend.base.errors.{CompilationMessageMapper, ErrorCompilerMessage} +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.snapi.frontend.utils.ExtraRewriters abstract class BaseTree[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest](ensureTree: Boolean)( implicit val programContext: ProgramContext diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/CompilerContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala similarity index 77% rename from snapi-frontend/src/main/scala/raw/compiler/base/CompilerContext.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala index 033278038..24d407633 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/CompilerContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala @@ -10,11 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base +import com.rawlabs.utils.core.{RawSettings, RawUid} import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api.{InferrerProperties, InferrerService, InputFormatDescriptor} -import raw.utils._ +import com.rawlabs.snapi.frontend.inferrer.api.{InferrerProperties, InferrerService, InputFormatDescriptor} +import com.rawlabs.utils.core._ /** * Contains state that is shared between different programs. diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/Counter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Counter.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/base/Counter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Counter.scala index 248792300..37d19303c 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/Counter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Counter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/Keywords.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Keywords.scala similarity index 92% rename from snapi-frontend/src/main/scala/raw/compiler/base/Keywords.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Keywords.scala index 8c03b5477..82252ef21 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/Keywords.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Keywords.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base trait Keywords { diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/Phase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Phase.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/base/Phase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Phase.scala index 3e24aeb66..81e81e738 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/Phase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Phase.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base import com.google.common.base.Stopwatch import com.typesafe.scalalogging.StrictLogging diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/PrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/PrettyPrinter.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/base/PrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/PrettyPrinter.scala index 2fb6b59f7..3cfec3f90 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/PrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/PrettyPrinter.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base -import raw.compiler.base.source.BaseNode +import com.rawlabs.snapi.frontend.base.source.BaseNode trait PrettyPrinter extends org.bitbucket.inkytonik.kiama.output.PrettyPrinter { diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/ProgramContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/ProgramContext.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/base/ProgramContext.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/ProgramContext.scala index 3400110fa..03a69715e 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/ProgramContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/ProgramContext.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base -import raw.utils.RawSettings -import raw.client.api.{CompilerService, ProgramEnvironment} +import com.rawlabs.compiler.{CompilerService, ProgramEnvironment} +import com.rawlabs.utils.core.RawSettings /** * Contains state that is shared between compilation phases of a single program. diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/SemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/base/SemanticAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala index 6cb0254b7..deedec3e0 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/SemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.attribution.Decorators import org.bitbucket.inkytonik.kiama.util.{Entity, Environments} -import raw.compiler.base.errors._ -import raw.compiler.base.source._ -import raw.compiler.utils.{Attribution, ExtraRewriters} +import com.rawlabs.snapi.frontend.base.errors._ +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.snapi.frontend.utils.{Attribution, ExtraRewriters} /** Used by some methods as a helper to avoid returning Either. */ class UnsupportedTypeException(val t: Type) extends Throwable { diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/SymbolTable.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SymbolTable.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/base/SymbolTable.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SymbolTable.scala index fb6f5d553..527c39846 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/SymbolTable.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SymbolTable.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.util.Entity diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SyntaxAnalyzer.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/base/SyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SyntaxAnalyzer.scala index 13ab5f167..4ff3f2e65 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SyntaxAnalyzer.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base +import com.rawlabs.utils.core.RawUtils import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.parsing._ import org.bitbucket.inkytonik.kiama.util._ -import raw.compiler.base.source._ -import raw.utils._ +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.utils.core._ import scala.util.matching.Regex diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/Tree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala similarity index 92% rename from snapi-frontend/src/main/scala/raw/compiler/base/Tree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala index 5e2068275..f0e5404a1 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/Tree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base +import com.rawlabs.utils.core.RawUtils import org.apache.commons.lang3.StringUtils import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} -import raw.compiler.base.source._ -import raw.compiler.common.source.ErrorType -import raw.utils._ +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.snapi.frontend.common.source.ErrorType +import com.rawlabs.utils.core._ abstract class Tree[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest]( protected val originalRoot: P, @@ -25,7 +26,7 @@ abstract class Tree[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest] extends BaseTree[N, P, E](ensureTree) { private val checkSyntaxAnalyzers = - programContext.settings.getBooleanOpt("raw.check-syntax-analyzers").getOrElse(false) + programContext.settings.getBooleanOpt("raw.snapi.frontend.check-syntax-analyzers").getOrElse(false) protected def cloneWithPositions(): TreeWithPositions[N, P, E] diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/TreeDescription.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeDescription.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/compiler/base/TreeDescription.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeDescription.scala index a53ecf737..7b54a5eb1 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/TreeDescription.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeDescription.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base -import raw.compiler.base.source.Type +import com.rawlabs.snapi.frontend.base.source.Type final case class TreeDescription( expDecls: Map[String, List[TreeDeclDescription]], diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/TreeWithPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala similarity index 93% rename from snapi-frontend/src/main/scala/raw/compiler/base/TreeWithPositions.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala index 1b3e6d388..dd233e19d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/TreeWithPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala @@ -10,14 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.base +package com.rawlabs.snapi.frontend.base +import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange, Message} +import com.rawlabs.utils.core.RawUtils import org.bitbucket.inkytonik.kiama.util.Positions -import raw.client.api._ -import raw.compiler.base.errors.CompilationMessageMapper -import raw.compiler.base.source._ -import raw.compiler.rql2.antlr4.ParseProgramResult -import raw.utils._ +import com.rawlabs.snapi.frontend.base.errors.CompilationMessageMapper +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.snapi.frontend.rql2.antlr4.ParseProgramResult +import com.rawlabs.utils.core._ abstract class TreeWithPositions[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest]( val originalSource: String, diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/errors/Errors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/Errors.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/base/errors/Errors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/Errors.scala index 00744b994..d4d84770b 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/errors/Errors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/Errors.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.base.errors +package com.rawlabs.snapi.frontend.base.errors -import raw.client.api._ -import raw.compiler.base.source._ +import com.rawlabs.compiler.{ErrorMessage, ErrorRange, HintMessage, InfoMessage, Message, WarningMessage} +import com.rawlabs.snapi.frontend.base.source._ object CompilationMessageMapper { diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/errors/ErrorsPrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/ErrorsPrettyPrinter.scala similarity index 91% rename from snapi-frontend/src/main/scala/raw/compiler/base/errors/ErrorsPrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/ErrorsPrettyPrinter.scala index b52cc521c..aaf5ff105 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/errors/ErrorsPrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/errors/ErrorsPrettyPrinter.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.base.errors +package com.rawlabs.snapi.frontend.base.errors -import raw.compiler.base -import raw.compiler.base.source.{BaseNode, NotValueType} -import raw.client.api.{ErrorMessage, ErrorRange} +import com.rawlabs.compiler.{ErrorMessage, ErrorRange} +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.base.source.{BaseNode, NotValueType} trait ErrorsPrettyPrinter extends base.source.SourcePrettyPrinter { diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/source/SourcePrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourcePrettyPrinter.scala similarity index 88% rename from snapi-frontend/src/main/scala/raw/compiler/base/source/SourcePrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourcePrettyPrinter.scala index 4eacbc5b2..4a7480cfb 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/source/SourcePrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourcePrettyPrinter.scala @@ -10,11 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.base.source +package com.rawlabs.snapi.frontend.base.source +import com.rawlabs.utils.core.RawUtils import com.typesafe.scalalogging.StrictLogging -import raw.compiler.base.{Keywords, PrettyPrinter, SyntaxAnalyzer} -import raw.utils._ +import com.rawlabs.snapi.frontend.base.{Keywords, PrettyPrinter, SyntaxAnalyzer} +import com.rawlabs.utils.core._ import scala.language.implicitConversions diff --git a/snapi-frontend/src/main/scala/raw/compiler/base/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/base/source/SourceTree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala index 6cedc9033..75f80f65a 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/base/source/SourceTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.base.source +package com.rawlabs.snapi.frontend.base.source trait BaseNode extends Product diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala new file mode 100644 index 000000000..81644822b --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala @@ -0,0 +1,35 @@ +/* + * Copyright 2023 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.common + +import com.rawlabs.snapi.frontend.common.source._ + +final case class PhaseDescriptor( + name: String, + phase: Class[com.rawlabs.snapi.frontend.base.PipelinedPhase[SourceProgram]] +) extends com.rawlabs.snapi.frontend.base.PhaseDescriptor[SourceProgram] { + + override def instance( + cur: com.rawlabs.snapi.frontend.base.Phase[SourceProgram], + programContext: com.rawlabs.snapi.frontend.base.ProgramContext + ): com.rawlabs.snapi.frontend.base.PipelinedPhase[SourceProgram] = { + phase + .getConstructor( + classOf[com.rawlabs.snapi.frontend.base.Phase[SourceProgram]], + classOf[String], + classOf[com.rawlabs.snapi.frontend.base.ProgramContext] + ) + .newInstance(cur, name, programContext) + } + +} diff --git a/snapi-frontend/src/main/scala/raw/compiler/common/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/common/source/SourceTree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala index 92f3b634a..28ebe27ad 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/common/source/SourceTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.common.source +package com.rawlabs.snapi.frontend.common.source import org.bitbucket.inkytonik.kiama.output._ -import raw.compiler.base.source.Type +import com.rawlabs.snapi.frontend.base.source.Type import org.bitbucket.inkytonik.kiama.output.PrettyExpression import org.bitbucket.inkytonik.kiama.rewriting.Strategy import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ -import raw.compiler.base.Counter -import raw.compiler.base.source._ +import com.rawlabs.snapi.frontend.base.Counter +import com.rawlabs.snapi.frontend.base.source._ trait SourceNode extends BaseNode diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/DateTimeFormatFinder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/DateTimeFormatFinder.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/inferrer/api/DateTimeFormatFinder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/DateTimeFormatFinder.scala index efc91cfaa..cd486d20e 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/DateTimeFormatFinder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/DateTimeFormatFinder.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api import java.time._ import java.time.format.{DateTimeFormatter, DateTimeParseException} diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerException.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerException.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/inferrer/api/InferrerException.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerException.scala index 55fbf417c..ee7894ec7 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerException.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerException.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api -import raw.utils.RawServiceException +import com.rawlabs.utils.core.RawServiceException class InferrerException(message: String, cause: Throwable = null) extends RawServiceException(s"inference error: $message", cause) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerProperties.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerProperties.scala similarity index 91% rename from snapi-frontend/src/main/scala/raw/inferrer/api/InferrerProperties.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerProperties.scala index b8c607afa..b730c6969 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerProperties.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerProperties.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api -import raw.sources.api._ -import raw.sources.bytestream.api.ByteStreamLocation -import raw.sources.filesystem.api.FileSystemLocation -import raw.sources.jdbc.api.{JdbcServerLocation, JdbcTableLocation} +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation +import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation +import com.rawlabs.utils.sources.jdbc.api.{JdbcServerLocation, JdbcTableLocation} sealed trait InferrerProperties { def maybeSampleSize: Option[Int] diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/inferrer/api/InferrerService.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala index fe000b405..10d9bcfda 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api import com.google.common.base.Stopwatch import com.google.common.cache.{CacheBuilder, CacheLoader, LoadingCache} -import raw.utils.{RawException, RawService, RawSettings, RawUtils} +import com.rawlabs.utils.core.{RawException, RawService, RawSettings, RawUtils} import java.util.concurrent.{ExecutionException, Executors, TimeUnit, TimeoutException} object InferrerService { - private val INFERRER_TIMEOUT = "raw.inferrer.timeout" - private val INFERRER_EXPIRY = "raw.inferrer.expiry" + private val INFERRER_TIMEOUT = "raw.snapi.frontend.inferrer.timeout" + private val INFERRER_EXPIRY = "raw.snapi.frontend.inferrer.expiry" - private val INFERRER_CACHE_SIZE = "raw.inferrer.cache-size" + private val INFERRER_CACHE_SIZE = "raw.snapi.frontend.inferrer.cache-size" - private val INFERRER_THREAD_POOL_SIZE = "raw.inferrer.thread-pool-size" + private val INFERRER_THREAD_POOL_SIZE = "raw.snapi.frontend.inferrer.thread-pool-size" private val prettyPrinter = new SourceTypePrettyPrinter } diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerServiceProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerServiceProvider.scala similarity index 76% rename from snapi-frontend/src/main/scala/raw/inferrer/api/InferrerServiceProvider.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerServiceProvider.scala index 24d46f329..cfd7d394f 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/InferrerServiceProvider.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerServiceProvider.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api -import raw.inferrer.local.LocalInferrerService -import raw.utils.RawSettings +import com.rawlabs.utils.core.RawSettings +import com.rawlabs.snapi.frontend.inferrer.local.LocalInferrerService object InferrerServiceProvider { - private val INFERRER_IMPL = "raw.inferrer.impl" + private val INFERRER_IMPL = "raw.snapi.frontend.inferrer.impl" def apply()(implicit settings: RawSettings): InferrerService = { settings.getStringOpt(INFERRER_IMPL) match { diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/InputFormatDescriptors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InputFormatDescriptors.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/inferrer/api/InputFormatDescriptors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InputFormatDescriptors.scala index 3a5eaec43..5b609d582 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/InputFormatDescriptors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InputFormatDescriptors.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api -import raw.sources.api.Encoding +import com.rawlabs.utils.sources.api.Encoding sealed trait InputFormatDescriptor { def tipe: SourceType diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/SourceTypePrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/inferrer/api/SourceTypePrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala index cacc15d40..c88ba92d1 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/SourceTypePrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api import org.bitbucket.inkytonik.kiama.output.PrettyPrinter diff --git a/snapi-frontend/src/main/scala/raw/inferrer/api/SourceTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/inferrer/api/SourceTypes.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala index 8fab64c7e..96dc5b1fa 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/api/SourceTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.inferrer.api +package com.rawlabs.snapi.frontend.inferrer.api sealed abstract class SourceType diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/EncodingInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/EncodingInferrer.scala similarity index 92% rename from snapi-frontend/src/main/scala/raw/inferrer/local/EncodingInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/EncodingInferrer.scala index a1310674b..f30b2d941 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/EncodingInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/EncodingInferrer.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local import java.io.{InputStream, InputStreamReader, Reader} import com.ibm.icu.text.CharsetDetector +import com.rawlabs.utils.core.RawSettings import com.typesafe.scalalogging.StrictLogging import org.apache.commons.io.ByteOrderMark import org.apache.commons.io.input.BOMInputStream -import raw.sources.api._ -import raw.sources.bytestream.api.SeekableInputStream -import raw.utils.RawSettings +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream private[inferrer] case class TextBuffer(reader: Reader, encoding: Encoding, confidence: Int) object EncodingInferrer { - private val ENCODING_DETECTION_READ_SIZE = "raw.inferrer.local.encoding-detection-read-size" + private val ENCODING_DETECTION_READ_SIZE = "raw.snapi.frontend.inferrer.local.encoding-detection-read-size" } private[inferrer] trait EncodingInferrer extends StrictLogging { diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/InferrerErrorHandler.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/InferrerErrorHandler.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/inferrer/local/InferrerErrorHandler.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/InferrerErrorHandler.scala index daa68b5ef..fbc9024d0 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/InferrerErrorHandler.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/InferrerErrorHandler.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local import com.typesafe.scalalogging.StrictLogging diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/LocalInferrerException.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerException.scala similarity index 80% rename from snapi-frontend/src/main/scala/raw/inferrer/local/LocalInferrerException.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerException.scala index 85c54b5cd..36e789106 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/LocalInferrerException.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerException.scala @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local -import raw.inferrer.api.InferrerException +import com.rawlabs.snapi.frontend.inferrer.api.InferrerException class LocalInferrerException(message: String, cause: Throwable = null) extends InferrerException(message, cause) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/LocalInferrerService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala similarity index 91% rename from snapi-frontend/src/main/scala/raw/inferrer/local/LocalInferrerService.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala index 074adc8d4..0ef48c6d9 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/LocalInferrerService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local +import com.rawlabs.utils.core.{RawException, RawSettings} import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.output.PrettyPrinter -import raw.compiler.rql2.api.LocationDescription -import raw.utils.{RawException, RawSettings} -import raw.inferrer.api._ -import raw.inferrer.local.auto.{AutoInferrer, InferrerBufferedSeekableIS} -import raw.inferrer.local.csv.{CsvInferrer, CsvMergeTypes} -import raw.inferrer.local.hjson.HjsonInferrer -import raw.inferrer.local.jdbc.JdbcInferrer -import raw.inferrer.local.json.JsonInferrer -import raw.inferrer.local.text.TextInferrer -import raw.inferrer.local.xml.{XmlInferrer, XmlMergeTypes} -import raw.sources.api._ -import raw.sources.bytestream.api.ByteStreamLocation -import raw.sources.filesystem.api.FileSystemLocation -import raw.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local.auto.{AutoInferrer, InferrerBufferedSeekableIS} +import com.rawlabs.snapi.frontend.inferrer.local.csv.{CsvInferrer, CsvMergeTypes} +import com.rawlabs.snapi.frontend.inferrer.local.hjson.HjsonInferrer +import com.rawlabs.snapi.frontend.inferrer.local.jdbc.JdbcInferrer +import com.rawlabs.snapi.frontend.inferrer.local.json.JsonInferrer +import com.rawlabs.snapi.frontend.inferrer.local.text.TextInferrer +import com.rawlabs.snapi.frontend.inferrer.local.xml.{XmlInferrer, XmlMergeTypes} +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation +import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation import scala.util.control.NonFatal @@ -53,9 +53,9 @@ class LocalInferrerService(implicit settings: RawSettings) xmlInferrer ) - private val defaultSampleFiles = settings.getInt("raw.inferrer.local.sample-files") + private val defaultSampleFiles = settings.getInt("raw.snapi.frontend.inferrer.local.sample-files") // This buffered-IS is only valid for text formats - private val useBufferedSeekableIs = settings.getBoolean("raw.inferrer.local.use-buffered-seekable-is") + private val useBufferedSeekableIs = settings.getBoolean("raw.snapi.frontend.inferrer.local.use-buffered-seekable-is") private def textInputStream(loc: ByteStreamLocation) = { if (useBufferedSeekableIs) { diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/MergeTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/inferrer/local/MergeTypes.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala index f3758704b..87fbbd8a5 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/MergeTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.api._ import scala.collection.mutable private[inferrer] trait MergeTypes extends StrictLogging { diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/TextTypeInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrer.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/inferrer/local/TextTypeInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrer.scala index 1c21928d0..8ed10ad9a 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/TextTypeInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrer.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local import org.apache.commons.lang3.math.NumberUtils -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.api._ import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/auto/AutoInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala similarity index 86% rename from snapi-frontend/src/main/scala/raw/inferrer/local/auto/AutoInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala index 58e65cab0..b58d9b8d2 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/auto/AutoInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package raw.inferrer.local.auto +package com.rawlabs.snapi.frontend.inferrer.local.auto +import com.rawlabs.utils.core.RawSettings import java.io.Reader import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api._ -import raw.inferrer.local._ -import raw.inferrer.local.csv.CsvInferrer -import raw.inferrer.local.hjson.HjsonInferrer -import raw.inferrer.local.json.JsonInferrer -import raw.inferrer.local.text.TextInferrer -import raw.inferrer.local.xml.XmlInferrer -import raw.sources.bytestream.api.ByteStreamLocation -import raw.sources.filesystem.api.{DirectoryMetadata, FileSystemLocation} -import raw.utils.RawSettings +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.snapi.frontend.inferrer.local.csv.CsvInferrer +import com.rawlabs.snapi.frontend.inferrer.local.hjson.HjsonInferrer +import com.rawlabs.snapi.frontend.inferrer.local.json.JsonInferrer +import com.rawlabs.snapi.frontend.inferrer.local.text.TextInferrer +import com.rawlabs.snapi.frontend.inferrer.local.xml.XmlInferrer +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation +import com.rawlabs.utils.sources.filesystem.api.{DirectoryMetadata, FileSystemLocation} object AutoInferrer { - private val USE_BUFFERED_SEEKABLE_IS = "raw.inferrer.local.use-buffered-seekable-is" + private val USE_BUFFERED_SEEKABLE_IS = "raw.snapi.frontend.inferrer.local.use-buffered-seekable-is" } class AutoInferrer( diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/auto/InferrerBufferedSeekableIS.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/InferrerBufferedSeekableIS.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/inferrer/local/auto/InferrerBufferedSeekableIS.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/InferrerBufferedSeekableIS.scala index 91756449c..e93e0f3ef 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/auto/InferrerBufferedSeekableIS.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/InferrerBufferedSeekableIS.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.inferrer.local.auto +package com.rawlabs.snapi.frontend.inferrer.local.auto -import raw.sources.bytestream.api.SeekableInputStream +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream import java.nio.ByteBuffer diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala similarity index 87% rename from snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala index 190777614..3cef78292 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package raw.inferrer.local.csv +package com.rawlabs.snapi.frontend.inferrer.local.csv +import com.rawlabs.utils.core.{RawException, RawSettings} import java.io.Reader import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.local._ -import raw.inferrer.local.text.TextLineIterator -import raw.inferrer.api._ -import raw.sources.bytestream.api.SeekableInputStream -import raw.sources.api.Encoding -import raw.utils.{RawException, RawSettings} +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.snapi.frontend.inferrer.local.text.TextLineIterator +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream +import com.rawlabs.utils.sources.api.Encoding import scala.util.control.NonFatal object CsvInferrer { - private val CSV_SAMPLE_SIZE = "raw.inferrer.local.csv.sample-size" - private val CSV_SEPARATOR_SAMPLE_SIZE = "raw.inferrer.local.csv.separator-sample-size" - private val CSV_QUOTED_WEIGHT = "raw.inferrer.local.csv.quoted-weight" + private val CSV_SAMPLE_SIZE = "raw.snapi.frontend.inferrer.local.csv.sample-size" + private val CSV_SEPARATOR_SAMPLE_SIZE = "raw.snapi.frontend.inferrer.local.csv.separator-sample-size" + private val CSV_QUOTED_WEIGHT = "raw.snapi.frontend.inferrer.local.csv.quoted-weight" } class CsvInferrer(implicit protected val settings: RawSettings) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvMergeTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvMergeTypes.scala similarity index 79% rename from snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvMergeTypes.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvMergeTypes.scala index 59f4b783a..03ed72ab3 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvMergeTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvMergeTypes.scala @@ -10,10 +10,16 @@ * licenses/APL.txt. */ -package raw.inferrer.local.csv +package com.rawlabs.snapi.frontend.inferrer.local.csv -import raw.inferrer.api.{SourceAnyType, SourceAttrType, SourceNullableType, SourceRecordType, SourceType} -import raw.inferrer.local.MergeTypes +import com.rawlabs.snapi.frontend.inferrer.api.{ + SourceAnyType, + SourceAttrType, + SourceNullableType, + SourceRecordType, + SourceType +} +import com.rawlabs.snapi.frontend.inferrer.local.MergeTypes trait CsvMergeTypes extends MergeTypes { diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvTypeSniffer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvTypeSniffer.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvTypeSniffer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvTypeSniffer.scala index e366de265..be6bbe3ac 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/csv/CsvTypeSniffer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvTypeSniffer.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.inferrer.local.csv +package com.rawlabs.snapi.frontend.inferrer.local.csv import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api.{ +import com.rawlabs.snapi.frontend.inferrer.api.{ SourceAttrType, SourceCollectionType, SourceDoubleType, @@ -23,7 +23,7 @@ import raw.inferrer.api.{ SourceStringType, SourceType } -import raw.inferrer.local._ +import com.rawlabs.snapi.frontend.inferrer.local._ import scala.collection.mutable.ArrayBuffer diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/hjson/HjsonInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/inferrer/local/hjson/HjsonInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala index ec34cd76d..d85eff3b2 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/hjson/HjsonInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package raw.inferrer.local.hjson +package com.rawlabs.snapi.frontend.inferrer.local.hjson import com.fasterxml.jackson.core.JsonProcessingException import com.fasterxml.jackson.databind.ObjectMapper -import raw.inferrer.api._ -import raw.inferrer.local._ -import raw.inferrer.local.json.JsonUtils -import raw.inferrer.local.text.TextLineIterator -import raw.sources.api._ -import raw.sources.bytestream.api.SeekableInputStream -import raw.utils.{RawException, RawSettings} +import com.rawlabs.utils.core.{RawException, RawSettings} +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.snapi.frontend.inferrer.local.json.JsonUtils +import com.rawlabs.snapi.frontend.inferrer.local.text.TextLineIterator +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream import java.io.Reader import scala.util.control.NonFatal object HjsonInferrer { - private val HJSON_SAMPLE_SIZE = "raw.inferrer.local.hjson.sample-size" + private val HJSON_SAMPLE_SIZE = "raw.snapi.frontend.inferrer.local.hjson.sample-size" } class HjsonInferrer(implicit protected val settings: RawSettings) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/jdbc/JdbcInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/jdbc/JdbcInferrer.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/inferrer/local/jdbc/JdbcInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/jdbc/JdbcInferrer.scala index f2bc01013..cc37b4378 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/jdbc/JdbcInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/jdbc/JdbcInferrer.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.inferrer.local.jdbc +package com.rawlabs.snapi.frontend.inferrer.local.jdbc import java.sql.ResultSetMetaData import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api.{SourceAttrType, SourceCollectionType, SourceRecordType, SourceType} -import raw.sources.jdbc.api.{JdbcServerLocation, JdbcTableLocation} +import com.rawlabs.snapi.frontend.inferrer.api.{SourceAttrType, SourceCollectionType, SourceRecordType, SourceType} +import com.rawlabs.utils.sources.jdbc.api.{JdbcServerLocation, JdbcTableLocation} import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/jdbc/JdbcTypeToSourceType.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/jdbc/JdbcTypeToSourceType.scala similarity index 93% rename from snapi-frontend/src/main/scala/raw/inferrer/local/jdbc/JdbcTypeToSourceType.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/jdbc/JdbcTypeToSourceType.scala index b0dc2dd0b..4650c9cdf 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/jdbc/JdbcTypeToSourceType.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/jdbc/JdbcTypeToSourceType.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.inferrer.local.jdbc +package com.rawlabs.snapi.frontend.inferrer.local.jdbc -import raw.inferrer.api.{ +import com.rawlabs.snapi.frontend.inferrer.api.{ InferrerException, SourceAttrType, SourceBinaryType, @@ -33,7 +33,13 @@ import raw.inferrer.api.{ SourceTimestampType, SourceType } -import raw.sources.jdbc.api.{JdbcColumnType, NativeIntervalType, TableColumn, TableMetadata, UnsupportedColumnType} +import com.rawlabs.utils.sources.jdbc.api.{ + JdbcColumnType, + NativeIntervalType, + TableColumn, + TableMetadata, + UnsupportedColumnType +} import java.sql.ResultSetMetaData import java.sql.Types._ diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/json/JsonInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala similarity index 92% rename from snapi-frontend/src/main/scala/raw/inferrer/local/json/JsonInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala index 2be2a2f3f..1cf8c8da6 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/json/JsonInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.inferrer.local.json +package com.rawlabs.snapi.frontend.inferrer.local.json import java.io.Reader import com.fasterxml.jackson.core._ import com.fasterxml.jackson.core.exc.InputCoercionException -import raw.inferrer.api._ -import raw.inferrer.local._ -import raw.sources.api._ -import raw.sources.bytestream.api.SeekableInputStream -import raw.utils.{RawException, RawSettings} +import com.rawlabs.utils.core.{RawException, RawSettings} +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream import scala.collection.mutable.ArrayBuffer import scala.util.control.NonFatal object JsonInferrer { - private val JSON_SAMPLE_SIZE = "raw.inferrer.local.json.sample-size" + private val JSON_SAMPLE_SIZE = "raw.snapi.frontend.inferrer.local.json.sample-size" } class JsonInferrer(implicit protected val settings: RawSettings) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/json/JsonUtils.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonUtils.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/inferrer/local/json/JsonUtils.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonUtils.scala index 1abf37cc2..e74650568 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/json/JsonUtils.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonUtils.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.inferrer.local.json +package com.rawlabs.snapi.frontend.inferrer.local.json import com.fasterxml.jackson.core.JsonParser.Feature import com.fasterxml.jackson.core.json.JsonReadFeature import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.local._ -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.snapi.frontend.inferrer.api._ import scala.collection.JavaConverters._ import scala.collection.immutable diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/text/TextInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala similarity index 93% rename from snapi-frontend/src/main/scala/raw/inferrer/local/text/TextInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala index 3a5e23a1e..48e446f33 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/text/TextInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.inferrer.local.text +package com.rawlabs.snapi.frontend.inferrer.local.text +import com.rawlabs.utils.core.{RawException, RawSettings} import java.io.Reader import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api._ -import raw.inferrer.local._ -import raw.sources.api._ -import raw.sources.bytestream.api.SeekableInputStream -import raw.utils.{RawException, RawSettings} +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream import scala.util.control.NonFatal import scala.util.matching.Regex @@ -26,7 +26,7 @@ import scala.util.matching.Regex private case class RegexToType(regex: Regex, atts: Seq[SourceAttrType]) object TextInferrer { - private val TEXT_SAMPLE_SIZE = "raw.inferrer.local.text.sample-size" + private val TEXT_SAMPLE_SIZE = "raw.snapi.frontend.inferrer.local.text.sample-size" } class TextInferrer(implicit protected val settings: RawSettings) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/text/TextLineIterator.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextLineIterator.scala similarity index 90% rename from snapi-frontend/src/main/scala/raw/inferrer/local/text/TextLineIterator.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextLineIterator.scala index 231fb3ef6..dd075fb8e 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/text/TextLineIterator.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextLineIterator.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.inferrer.local.text +package com.rawlabs.snapi.frontend.inferrer.local.text import java.io.Reader diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/xml/InferrerXmlTypeReader.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/inferrer/local/xml/InferrerXmlTypeReader.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala index a3848a7fe..b880329ae 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/xml/InferrerXmlTypeReader.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.inferrer.local.xml +package com.rawlabs.snapi.frontend.inferrer.local.xml import com.ctc.wstx.api.WstxInputProperties import com.ctc.wstx.stax.WstxInputFactory import com.typesafe.scalalogging.StrictLogging import org.codehaus.stax2.XMLInputFactory2 -import raw.inferrer.local.{LocalInferrerException, TextTypeInferrer} -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local.{LocalInferrerException, TextTypeInferrer} +import com.rawlabs.snapi.frontend.inferrer.api._ import java.io.{Reader, StringReader} import javax.xml.stream.{XMLInputFactory, XMLStreamConstants} import scala.collection.mutable -import raw.inferrer.local.xml.InferrerXmlTypeReader._ +import com.rawlabs.snapi.frontend.inferrer.local.xml.InferrerXmlTypeReader._ /** * Xml reader with some of our business logic. diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/xml/XmlInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala similarity index 85% rename from snapi-frontend/src/main/scala/raw/inferrer/local/xml/XmlInferrer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala index 92afbfdc6..7396525a8 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/xml/XmlInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.inferrer.local.xml +package com.rawlabs.snapi.frontend.inferrer.local.xml +import com.rawlabs.utils.core.{RawException, RawSettings} import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api._ -import raw.inferrer.local._ -import raw.sources.api._ -import raw.sources.bytestream.api.SeekableInputStream -import raw.utils.{RawException, RawSettings} +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream import java.io.Reader import javax.xml.stream.XMLStreamException import scala.util.control.NonFatal object XmlInferrer { - private val XML_SAMPLE_SIZE = "raw.inferrer.local.xml.sample-size" + private val XML_SAMPLE_SIZE = "raw.snapi.frontend.inferrer.local.xml.sample-size" } class XmlInferrer(implicit protected val settings: RawSettings) diff --git a/snapi-frontend/src/main/scala/raw/inferrer/local/xml/XmlMergeTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala similarity index 93% rename from snapi-frontend/src/main/scala/raw/inferrer/local/xml/XmlMergeTypes.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala index 9e22e97ee..725fb36b2 100644 --- a/snapi-frontend/src/main/scala/raw/inferrer/local/xml/XmlMergeTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.inferrer.local.xml +package com.rawlabs.snapi.frontend.inferrer.local.xml -import raw.inferrer.api._ -import raw.inferrer.local._ -import raw.inferrer.local.xml.InferrerXmlTypeReader.TEXT_FIELD_NAME +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local._ +import com.rawlabs.snapi.frontend.inferrer.local.xml.InferrerXmlTypeReader.TEXT_FIELD_NAME import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/CommonSemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/CommonSemanticAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala index 7f8e67431..23dedc993 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/CommonSemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.util.Entity -import raw.compiler.base.{ExpectedType, MultipleEntity, TreeDescription, UnknownEntity} -import raw.compiler.base -import raw.compiler.base.source._ -import raw.compiler.base.errors._ -import raw.compiler.common.source._ +import com.rawlabs.snapi.frontend.base.{ExpectedType, MultipleEntity, TreeDescription, UnknownEntity} +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.snapi.frontend.base.errors._ +import com.rawlabs.snapi.frontend.common.source._ import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/FrontendSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/FrontendSyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala index 2686f8196..bf6f96c94 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/FrontendSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.parsing._ import org.bitbucket.inkytonik.kiama.util.Positions -import raw.compiler.base.SyntaxAnalyzer.identRegex -import raw.compiler.base.source.{BaseProgram, Type} -import raw.compiler.base -import raw.compiler.common.source._ -import raw.compiler.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.SyntaxAnalyzer.identRegex +import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ import scala.util.matching.Regex diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/ImplicitCasts.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ImplicitCasts.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/ImplicitCasts.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ImplicitCasts.scala index 6bf00e8bd..038a6218d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/ImplicitCasts.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ImplicitCasts.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy -import raw.compiler.base.Phase -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.builtin._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.Phase +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.builtin._ +import com.rawlabs.snapi.frontend.rql2.source._ /** * Applies implicit casts to core nodes of the language. */ class ImplicitCasts(protected val parent: Phase[SourceProgram], protected val phaseName: String)( - protected val baseProgramContext: raw.compiler.base.ProgramContext + protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase with Rql2TypeUtils { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/Keywords.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Keywords.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/Keywords.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Keywords.scala index 1d88d723c..5f93e9af8 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/Keywords.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Keywords.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.base +import com.rawlabs.snapi.frontend.base trait Keywords extends base.Keywords { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/ListProjDesugarer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ListProjDesugarer.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/ListProjDesugarer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ListProjDesugarer.scala index 09d45c365..ce97d87c8 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/ListProjDesugarer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ListProjDesugarer.scala @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.rewriting.Cloner.attempt import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy -import raw.compiler.base.Phase -import raw.compiler.common.source._ -import raw.compiler.rql2.builtin.{CollectionPackageBuilder, ListPackageBuilder} -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.Phase +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.builtin.{CollectionPackageBuilder, ListPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ class ListProjDesugarer(protected val parent: Phase[SourceProgram], protected val phaseName: String)( - protected val baseProgramContext: raw.compiler.base.ProgramContext + protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase { override protected def execute(program: SourceProgram): SourceProgram = { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/PipelinedPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala similarity index 82% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/PipelinedPhase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala index d5ec8edaa..9d49742f2 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/PipelinedPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala @@ -10,13 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.common.source.SourceProgram +import com.rawlabs.snapi.frontend.common.source.SourceProgram -trait PipelinedPhase extends raw.compiler.base.PipelinedPhase[SourceProgram] with source.SourcePrettyPrinter { +trait PipelinedPhase + extends com.rawlabs.snapi.frontend.base.PipelinedPhase[SourceProgram] + with source.SourcePrettyPrinter { - protected def baseProgramContext: raw.compiler.base.ProgramContext + protected def baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext implicit protected val programContext: ProgramContext = baseProgramContext.asInstanceOf[ProgramContext] diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/ProgramContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/ProgramContext.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala index 52ad1ca5a..2fdef57ab 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/ProgramContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.base.errors.ErrorCompilerMessage -import raw.compiler.rql2.api.{PackageExtension, PackageExtensionProvider, Rql2Value} -import raw.compiler.rql2.source.Rql2Program -import raw.inferrer.api.{InferrerProperties, InputFormatDescriptor} +import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage +import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, PackageExtensionProvider, Rql2Value} +import com.rawlabs.snapi.frontend.rql2.source.Rql2Program +import com.rawlabs.snapi.frontend.inferrer.api.{InferrerProperties, InputFormatDescriptor} import scala.collection.mutable -trait ProgramContext extends raw.compiler.base.ProgramContext { +trait ProgramContext extends com.rawlabs.snapi.frontend.base.ProgramContext { private val inferCache = new mutable.HashMap[InferrerProperties, Either[String, InputFormatDescriptor]] diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/Propagation.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Propagation.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/Propagation.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Propagation.scala index f6d4b69ee..850812a96 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/Propagation.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Propagation.scala @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy -import raw.compiler.base.Phase -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.api.{Arg, Rql2Value, ValueArg} -import raw.compiler.rql2.builtin._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.Phase +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, Rql2Value, ValueArg} +import com.rawlabs.snapi.frontend.rql2.builtin._ +import com.rawlabs.snapi.frontend.rql2.source._ /** * Rewrites the tree in order to propagate nullables and errors. */ class Propagation(protected val parent: Phase[SourceProgram], protected val phaseName: String)( - protected val baseProgramContext: raw.compiler.base.ProgramContext + protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase with Rql2TypeUtils { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/Rql2ProgramContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/Rql2ProgramContext.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala index 1aa9f68f6..0931b5e50 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/Rql2ProgramContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.client.api.ProgramEnvironment -import raw.compiler.base.CompilerContext +import com.rawlabs.compiler.ProgramEnvironment +import com.rawlabs.snapi.frontend.base.CompilerContext class Rql2ProgramContext( override val programEnvironment: ProgramEnvironment, diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/Rql2TypeUtils.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala similarity index 92% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/Rql2TypeUtils.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala index 968b94018..d63dec30c 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/Rql2TypeUtils.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala @@ -10,13 +10,35 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.compiler.{ + RawAttrType, + RawBinaryType, + RawBoolType, + RawByteType, + RawDateType, + RawDecimalType, + RawDoubleType, + RawFloatType, + RawIntType, + RawIntervalType, + RawIterableType, + RawListType, + RawLongType, + RawOrType, + RawRecordType, + RawShortType, + RawStringType, + RawTimeType, + RawTimestampType, + RawType, + RawUndefinedType +} import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} -import raw.client.api._ -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.api.{ +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api.{ Rql2BoolValue, Rql2ByteValue, Rql2DateValue, @@ -35,7 +57,7 @@ import raw.compiler.rql2.api.{ Rql2TimestampValue, Rql2Value } -import raw.compiler.rql2.builtin.{ +import com.rawlabs.snapi.frontend.rql2.builtin.{ DatePackageBuilder, IntervalPackageBuilder, ListPackageBuilder, @@ -44,8 +66,8 @@ import raw.compiler.rql2.builtin.{ TimePackageBuilder, TimestampPackageBuilder } -import raw.compiler.rql2.source._ -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api._ trait Rql2TypeUtils { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/SemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala similarity index 99% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/SemanticAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala index eb52493c5..b3226b907 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/SemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.util.Entity -import raw.compiler.base._ -import raw.compiler.base.errors._ -import raw.compiler.base.source._ -import raw.compiler.common.source._ -import raw.compiler.rql2.api.{ +import com.rawlabs.snapi.frontend.base._ +import com.rawlabs.snapi.frontend.base.errors._ +import com.rawlabs.snapi.frontend.base.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -34,8 +34,8 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.builtin.TypePackageBuilder -import raw.compiler.rql2.errors.{ +import com.rawlabs.snapi.frontend.rql2.builtin.TypePackageBuilder +import com.rawlabs.snapi.frontend.rql2.errors.{ CannotDetermineTypeOfParameter, ExpectedTypeButGotExpression, FailedToEvaluate, @@ -52,7 +52,7 @@ import raw.compiler.rql2.errors.{ UnexpectedArguments, UnexpectedOptionalArgument } -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.mutable import scala.util.control.NonFatal diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/StagedCompiler.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/StagedCompiler.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala index abc0f97a4..68a366f97 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/StagedCompiler.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.compiler.{CompilerService, ErrorMessage, ErrorPosition, ErrorRange, ProgramEnvironment} +import com.rawlabs.utils.core.RawSettings import org.graalvm.polyglot.{Context, PolyglotAccess, PolyglotException, Source, Value} -import raw.client.api.{CompilerService, ErrorMessage, ErrorPosition, ErrorRange, ProgramEnvironment} -import raw.compiler.base.source.Type -import raw.compiler.rql2.antlr4.ParserErrors -import raw.compiler.rql2.api._ -import raw.compiler.rql2.source._ -import raw.utils.RawSettings +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2.antlr4.ParserErrors +import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.mutable import scala.util.control.NonFatal diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/SugarExtensionDesugarer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SugarExtensionDesugarer.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/SugarExtensionDesugarer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SugarExtensionDesugarer.scala index df248315a..7491e0de7 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/SugarExtensionDesugarer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SugarExtensionDesugarer.scala @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.compiler.CompilerException import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy -import raw.client.api.CompilerException -import raw.compiler.base.Phase -import raw.compiler.base.errors.ErrorCompilerMessage -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.api.SugarEntryExtension -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.Phase +import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api.SugarEntryExtension +import com.rawlabs.snapi.frontend.rql2.source._ class SugarExtensionDesugarer(protected val parent: Phase[SourceProgram], protected val phaseName: String)( - protected val baseProgramContext: raw.compiler.base.ProgramContext + protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase { override protected def execute(program: SourceProgram): SourceProgram = { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/SymbolTable.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala similarity index 82% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/SymbolTable.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala index a1b15e055..87662f036 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/SymbolTable.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.util.Entity -import raw.compiler.base -import raw.compiler.common.source._ -import raw.compiler.rql2.api.PackageExtension -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api.PackageExtension +import com.rawlabs.snapi.frontend.rql2.source._ /** Entity for a program parameter. */ final class ProgramParamEntity(val p: SourceProgramParam) extends Entity diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/SyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala index e31325a77..ccd6fb79b 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.parsing._ import org.bitbucket.inkytonik.kiama.util.Positions -import raw.compiler.base.SyntaxAnalyzer.identRegex -import raw.compiler.base.source.{BaseProgram, Type} -import raw.compiler.base -import raw.compiler.common.source._ -import raw.compiler.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.SyntaxAnalyzer.identRegex +import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ import scala.util.matching.Regex diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/Tree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala similarity index 77% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/Tree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala index beebdba87..72ed11987 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/Tree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.common.source._ -import raw.compiler.rql2.source.InternalSourcePrettyPrinter +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source.InternalSourcePrettyPrinter class Tree(originalRoot: SourceProgram, ensureTree: Boolean = true)( implicit programContext: ProgramContext -) extends raw.compiler.base.Tree[SourceNode, SourceProgram, Exp](originalRoot, ensureTree) +) extends com.rawlabs.snapi.frontend.base.Tree[SourceNode, SourceProgram, Exp](originalRoot, ensureTree) with source.SourcePrettyPrinter with errors.ErrorsPrettyPrinter { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/TreeWithPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala similarity index 73% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/TreeWithPositions.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala index 91d3e4ed2..63bfe115a 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/TreeWithPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.common.source._ -import raw.compiler.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult} class TreeWithPositions(originalSource: String, ensureTree: Boolean = true, frontend: Boolean = false)( implicit programContext: ProgramContext -) extends raw.compiler.base.TreeWithPositions[SourceNode, SourceProgram, Exp](originalSource, ensureTree) +) extends com.rawlabs.snapi.frontend.base.TreeWithPositions[SourceNode, SourceProgram, Exp](originalSource, ensureTree) with source.SourcePrettyPrinter with errors.ErrorsPrettyPrinter { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/Antlr4SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/Antlr4SyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala index 6271afda6..8b28e30d9 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/Antlr4SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 +import com.rawlabs.compiler.Message import org.antlr.v4.runtime.tree.ParseTree import org.antlr.v4.runtime.{CharStreams, CommonTokenStream, TokenStream} import org.bitbucket.inkytonik.kiama.parsing.Parsers import org.bitbucket.inkytonik.kiama.util.{Positions, Source, StringSource} -import raw.client.api.Message -import raw.compiler.base.source.Type -import raw.compiler.common.source.SourceProgram -import raw.compiler.rql2.generated.{SnapiLexer, SnapiParser} -import raw.compiler.rql2.source.Rql2Program +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source.SourceProgram +import com.rawlabs.snapi.parser.generated.{SnapiLexer, SnapiParser} +import com.rawlabs.snapi.frontend.rql2.source.Rql2Program abstract class ParseResult(errors: List[Message]) { def hasErrors: Boolean = errors.nonEmpty diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala index 5be731330..f49e61cef 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} -import raw.compiler.base.source.{BaseNode, BaseProgram} -import raw.compiler.common.source.SourceProgram +import com.rawlabs.snapi.frontend.base.source.{BaseNode, BaseProgram} +import com.rawlabs.snapi.frontend.common.source.SourceProgram import java.util import scala.collection.JavaConverters._ diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/ParserErrors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/ParserErrors.scala similarity index 90% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/ParserErrors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/ParserErrors.scala index b523084a5..add4b86c4 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/ParserErrors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/ParserErrors.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 object ParserErrors { val ParserErrorCode = "parserError" diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawErrorListener.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawErrorListener.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawErrorListener.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawErrorListener.scala index 7d3319923..7b6c65be9 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawErrorListener.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawErrorListener.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 +import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange, Message} import org.antlr.v4.runtime.{BaseErrorListener, RecognitionException, Recognizer, Token} -import raw.client.api.{ErrorMessage, ErrorPosition, ErrorRange, Message} class RawErrorListener() extends BaseErrorListener { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawPositions.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawPositions.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawPositions.scala index 4657b81a9..e5fce72bc 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawPositions.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 import org.antlr.v4.runtime.{ParserRuleContext, Token} import org.bitbucket.inkytonik.kiama.util.{Position, Positions, Source} diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawSnapiVisitor.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawSnapiVisitor.scala similarity index 99% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawSnapiVisitor.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawSnapiVisitor.scala index aed57a402..040241a2c 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawSnapiVisitor.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawSnapiVisitor.scala @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 +import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange} +import com.rawlabs.utils.core.RawUtils import org.antlr.v4.runtime.ParserRuleContext import org.apache.commons.codec.binary.Hex import org.bitbucket.inkytonik.kiama.util.{Positions, Source} -import raw.client.api.{ErrorMessage, ErrorPosition, ErrorRange} -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} -import raw.compiler.rql2.generated.{SnapiParser, SnapiParserBaseVisitor} -import raw.compiler.rql2.source._ -import raw.utils.RawUtils +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.parser.generated.{SnapiParser, SnapiParserBaseVisitor} +import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.JavaConverters._ import scala.util.Try diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawVisitorParseErrors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawVisitorParseErrors.scala similarity index 87% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawVisitorParseErrors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawVisitorParseErrors.scala index c6938d2f9..7be9bdaa7 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/antlr4/RawVisitorParseErrors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawVisitorParseErrors.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.antlr4 +package com.rawlabs.snapi.frontend.rql2.antlr4 -import raw.client.api.Message +import com.rawlabs.compiler.Message case class RawVisitorParseErrors() { private var errors: List[Message] = List.empty diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala new file mode 100644 index 000000000..e8f49a614 --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala @@ -0,0 +1,302 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.rql2.api + +object EntryExtensionProvider { + + private val entryExtensions: Array[EntryExtension] = Array( + new com.rawlabs.snapi.frontend.rql2.builtin.AwsV4SignedRequest, + new com.rawlabs.snapi.frontend.rql2.builtin.FromStringBinaryEntryExtension, + new com.rawlabs.snapi.frontend.rql2.builtin.BinaryReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.BinaryBase64Entry, + new com.rawlabs.snapi.frontend.rql2.builtin.ByteFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EmptyCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.BuildCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FilterCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.AvgCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OrderByCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TransformCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DistinctCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.CountCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TupleAvgCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MinCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MaxCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SumCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FirstCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FindFirstCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LastCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FindLastCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TakeCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ExplodeCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.UnnestCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FromCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.GroupCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.JoinCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.InternalJoinCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EquiJoinCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.InternalEquiJoinCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.UnionCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ExistsCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ContainsCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ZipCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MkStringCollectionEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.CsvInferAndReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.CsvReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.CsvInferAndParseEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.CsvParseEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateFromEpochDayEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateFromTimestampEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateParseEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateNowEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateYearEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateMonthEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateDayEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateAddIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DecimalFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DecimalRoundEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DoubleFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentSecretEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentScopesEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentParameterEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildWithTypeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ErrorGetEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FloatFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FunctionInvokeAfterEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlEncodeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlDecodeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpPutEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpDeleteEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpGetEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpHeadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpOptionsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpPatchEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpPostEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.BuildIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalToMillisEntryExtension, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalFromMillisEntryExtension, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalParseEntryExtension, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalYearsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalMonthsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalWeeksEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalDaysEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalHoursEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalMinutesEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalSecondsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalMillisEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntRangeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.InferAndReadJsonEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ReadJsonEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.InferAndParseJsonEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ParseJsonEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.PrintJsonEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.KryoEncodeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.KryoDecodeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EmptyListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.BuildListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.GetListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FilterListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TransformListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TakeListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SumListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MaxListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MinListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FirstListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FindFirstListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LastListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FindLastListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.CountListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ExplodeListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.UnnestListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FromListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.UnsafeFromListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.GroupListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.JoinListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.EquiJoinListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OrderByListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DistinctListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.UnionListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.AvgListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ExistsListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ContainsListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ZipListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MkStringListEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LocationFromStringEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LocationDescribeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LocationLsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LocationLlEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LongFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LongRangeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathPiEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathRandomEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathPowerEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathAtn2Entry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathAbsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathAcosEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathAsinEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathAtanEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathCeilingEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathCosEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathCotEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathDegreesEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathExpEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathLogEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathLog10Entry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathRadiansEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathSignEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathSinEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathSqrtEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathTanEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathSquareEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MathFloorEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MySQLInferAndReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MySQLReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MySQLInferAndQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MySQLQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.NullableEmptyEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.NullableBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.NullableIsNullEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.NullableUnsafeGetEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.NullableTransformEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FlatMapNullableTryableEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OracleInferAndReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OracleReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OracleInferAndQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OracleQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLInferAndReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLInferAndQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordConcatEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordFieldsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordAddFieldEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordRemoveFieldEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordGetFieldByIndexEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RegexReplaceEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RegexMatchesEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RegexFirstMatchInEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RegexGroupsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.S3BuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ShortFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeInferAndReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeInferAndQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerInferAndReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerInferAndQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerQueryEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringFromEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringReadEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringContainsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringTrimEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringLTrimEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringRTrimEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringReplaceEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringReverseEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringReplicateEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringUpperEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringLowerEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringSplitEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringLengthEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringSubStringEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringCountSubStringEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringStartsWithEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringEmptyEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.Base64EntryExtension, + new com.rawlabs.snapi.frontend.rql2.builtin.StringEncodeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringDecodeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringLevenshteinDistanceEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringReadLinesEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringCapitalizeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.SuccessBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MandatoryExpArgsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.MandatoryValueArgsEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OptionalExpArgsTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OptionalValueArgsTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.OptionalValueArgSugar, + new com.rawlabs.snapi.frontend.rql2.builtin.VarValueArgSugarTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.VarExpArgsTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.VarValueArgsTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringValueTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringExpTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsColPassThroughTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsColConsumeTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ByteValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ShortValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.LongValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.FloatValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DoubleValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.StringValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.BoolValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.DateValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ListValueArgTestEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeParseEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeNowEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeHourEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeMinuteEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeSecondEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeMillisEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeAddIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampBuildEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromDateEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampParseEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampNowEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampRangeEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampYearEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampMonthEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampDayEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampHourEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampMinuteEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampSecondEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampMillisEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromUnixTimestampEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampToUnixTimestampEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampTimeBucketEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampAddIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractIntervalEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TryTransformEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TryIsErrorEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TryIsSuccessEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TryFlatMapEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TryUnsafeGetEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TypeCastEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TypeProtectCastEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TypeEmptyEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.TypeMatchEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.InferAndReadXmlEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ReadXmlEntry, + new com.rawlabs.snapi.frontend.rql2.builtin.ParseXmlEntry + ) + + def getEntries(name: String): Array[EntryExtension] = { + entryExtensions.filter(_.packageName == name) + } + +} diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/LocationDescription.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/LocationDescription.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/api/LocationDescription.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/LocationDescription.scala index 4e60f0897..a520ed266 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/LocationDescription.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/LocationDescription.scala @@ -10,25 +10,36 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.api +package com.rawlabs.snapi.frontend.rql2.api -import raw.sources.api.Location -import raw.sources.bytestream.github.GitHubLocation -import raw.sources.bytestream.http.HttpByteStreamLocation -import raw.sources.bytestream.inmemory.InMemoryByteStreamLocation -import raw.sources.filesystem.api.FileSystemLocation -import raw.sources.filesystem.dropbox.{DropboxAccessTokenPath, DropboxUsernamePasswordPath} -import raw.sources.filesystem.local.LocalPath -import raw.sources.filesystem.mock.MockPath -import raw.sources.filesystem.s3.S3Path -import raw.sources.jdbc.mysql.{MySqlSchemaLocation, MySqlServerLocation, MySqlTableLocation} -import raw.sources.jdbc.oracle.{OracleSchemaLocation, OracleServerLocation, OracleTableLocation} -import raw.sources.jdbc.pgsql.{PostgresqlSchemaLocation, PostgresqlServerLocation, PostgresqlTableLocation} -import raw.sources.jdbc.snowflake.{SnowflakeSchemaLocation, SnowflakeServerLocation, SnowflakeTableLocation} -import raw.sources.jdbc.sqlite.{SqliteSchemaLocation, SqliteServerLocation, SqliteTableLocation} -import raw.sources.jdbc.sqlserver.{SqlServerSchemaLocation, SqlServerServerLocation, SqlServerTableLocation} -import raw.sources.jdbc.teradata.{TeradataSchemaLocation, TeradataServerLocation, TeradataTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.api.Location +import com.rawlabs.utils.sources.bytestream.github.GitHubLocation +import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation +import com.rawlabs.utils.sources.bytestream.inmemory.InMemoryByteStreamLocation +import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation +import com.rawlabs.utils.sources.filesystem.dropbox.{DropboxAccessTokenPath, DropboxUsernamePasswordPath} +import com.rawlabs.utils.sources.filesystem.local.LocalPath +import com.rawlabs.utils.sources.filesystem.mock.MockPath +import com.rawlabs.utils.sources.filesystem.s3.S3Path +import com.rawlabs.utils.sources.jdbc.mysql.{MySqlSchemaLocation, MySqlServerLocation, MySqlTableLocation} +import com.rawlabs.utils.sources.jdbc.oracle.{OracleSchemaLocation, OracleServerLocation, OracleTableLocation} +import com.rawlabs.utils.sources.jdbc.pgsql.{ + PostgresqlSchemaLocation, + PostgresqlServerLocation, + PostgresqlTableLocation +} +import com.rawlabs.utils.sources.jdbc.snowflake.{ + SnowflakeSchemaLocation, + SnowflakeServerLocation, + SnowflakeTableLocation +} +import com.rawlabs.utils.sources.jdbc.sqlite.{SqliteSchemaLocation, SqliteServerLocation, SqliteTableLocation} +import com.rawlabs.utils.sources.jdbc.sqlserver.{ + SqlServerSchemaLocation, + SqlServerServerLocation, + SqlServerTableLocation +} +import com.rawlabs.utils.sources.jdbc.teradata.{TeradataSchemaLocation, TeradataServerLocation, TeradataTableLocation} import java.io.{ByteArrayInputStream, ByteArrayOutputStream} import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} @@ -37,9 +48,10 @@ import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.datatype.jdk8.Jdk8Module import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule} +import com.rawlabs.compiler.ProgramEnvironment +import com.rawlabs.protocol.compiler.LocationConfig +import com.rawlabs.utils.core.RawSettings import com.typesafe.config.{ConfigException, ConfigFactory} -import raw.protocol.LocationConfig -import raw.client.api.ProgramEnvironment import java.net.{HttpURLConnection, URI, URISyntaxException} import scala.collection.JavaConverters._ diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtension.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtension.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtension.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtension.scala index 610cda5e2..97306ef0f 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtension.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtension.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.api - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ -import raw.compiler.rql2.{ProgramContext, Rql2TypeUtils} -import raw.client.api._ -import raw.sources.api._ -import raw.sources.bytestream.api.ByteStreamLocation +package com.rawlabs.snapi.frontend.rql2.api + +import com.rawlabs.compiler.{EntryDoc, PackageDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2TypeUtils} +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation import scala.annotation.nowarn import scala.collection.immutable.ListMap diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala new file mode 100644 index 000000000..7c87a9735 --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala @@ -0,0 +1,70 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.rql2.api + +import com.rawlabs.snapi.frontend.rql2.PackageEntity + +object PackageExtensionProvider { + + private val packageExtensions: Array[PackageExtension] = Array( + new com.rawlabs.snapi.frontend.rql2.builtin.BytePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.ShortPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.IntPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.LongPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.TimestampPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.DatePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.TimePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.RegexPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.StringPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.MathPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.CsvPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.CollectionPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.RecordPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.TypePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.LocationPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.ListPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.FloatPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.DoublePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.DecimalPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.BinaryPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.IntervalPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.JsonPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.XmlPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.ErrorPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.SuccessPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.NullablePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.TryPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.NullableTryablePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.HttpPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.S3Package, + new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.OraclePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.MySQLPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakePackage, + new com.rawlabs.snapi.frontend.rql2.builtin.FunctionPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.AwsPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.TestPackage, + new com.rawlabs.snapi.frontend.rql2.builtin.KryoPackage + ) + + val names: Array[String] = packageExtensions.map(_.name) + + val packages: Array[PackageEntity] = packageExtensions.map(s => new PackageEntity(s)) + + def getPackage(name: String): Option[PackageExtension] = { + packageExtensions.collectFirst { case p if p.name == name => p } + } + +} diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/Values.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/Values.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/api/Values.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/Values.scala index cce0c35f1..1c24228d7 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/Values.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/Values.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.api +package com.rawlabs.snapi.frontend.rql2.api -import raw.sources.api.Location +import com.rawlabs.utils.sources.api.Location sealed trait Rql2Value final case class Rql2StringValue(v: String) extends Rql2Value diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/Aggregations.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/Aggregations.scala similarity index 88% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/Aggregations.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/Aggregations.scala index d0b7764f9..ebf20caef 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/Aggregations.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/Aggregations.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.errors.ItemsNotComparable -import raw.compiler.rql2.api.{EntryExtension, EntryExtensionHelper} -import raw.compiler.rql2.source.{ +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable +import com.rawlabs.snapi.frontend.rql2.api.{EntryExtension, EntryExtensionHelper} +import com.rawlabs.snapi.frontend.rql2.source.{ HasTypeProperties, IsNullable, Rql2AttrType, diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/AwsPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/AwsPackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/AwsPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/AwsPackage.scala index ef44fcedc..d97d78320 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/AwsPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/AwsPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ -import raw.client.api._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class AwsPackage extends PackageExtension { override def name: String = "Aws" diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BinaryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BinaryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackage.scala index 951746b44..028258e1a 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BinaryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.client.api._ -import raw.compiler.rql2.api.{PackageExtension, ShortEntryExtension} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ class BinaryPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BinaryPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala similarity index 79% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BinaryPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala index df2de8a73..3543748cc 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BinaryPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object BinaryPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BytePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BytePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackage.scala index b6f435a4a..42eb600b3 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BytePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class BytePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BytePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BytePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala index c0b574d7e..b38cb15b8 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/BytePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object BytePackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CollectionPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackage.scala similarity index 99% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CollectionPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackage.scala index aabb84540..b1e8a8722 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CollectionPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackage.scala @@ -10,14 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.source._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -31,13 +32,12 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.errors.{ +import com.rawlabs.snapi.frontend.rql2.errors.{ InvalidOrderSpec, ItemsNotComparable, KeyNotComparable, OrderSpecMustFollowOrderingFunction } -import raw.client.api._ class CollectionPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CollectionPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CollectionPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala index 0a56f0f2b..9e062637d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CollectionPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object CollectionPackageBuilder { object Transform { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CsvPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CsvPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CsvPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CsvPackage.scala index 1891e0f96..d2e047135 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/CsvPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CsvPackage.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, UnsupportedType} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, UnsupportedType} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, EntryExtensionHelper, @@ -29,10 +30,9 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.source._ -import raw.client.api._ -import raw.inferrer.api._ -import raw.sources.bytestream.inmemory.InMemoryByteStreamLocation +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.utils.sources.bytestream.inmemory.InMemoryByteStreamLocation class CsvPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DatePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DatePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackage.scala index da86435ed..2902d969d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DatePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackage.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.rql2.api.{PackageExtension, ShortEntryExtension} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ class DatePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DatePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala similarity index 86% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DatePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala index 9dfafb172..52f68b4e9 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DatePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import java.time.LocalDate diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DecimalPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DecimalPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackage.scala index d5d030c80..a57e0aa0e 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DecimalPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ class DecimalPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DecimalPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DecimalPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala index c8516c294..92316a0b3 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DecimalPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object DecimalPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DoublePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DoublePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackage.scala index f912fb6ef..325181f6a 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DoublePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class DoublePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DoublePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DoublePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala index bbbe52eb3..8f0f56ee1 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/DoublePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object DoublePackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/EnvironmentPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackage.scala similarity index 84% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/EnvironmentPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackage.scala index cae68f36c..a9058b0d1 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/EnvironmentPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackage.scala @@ -10,13 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension, TypeParam} -import raw.compiler.rql2.source._ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension, + TypeParam +} +import com.rawlabs.snapi.frontend.rql2.source._ class EnvironmentPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/EnvironmentPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala similarity index 76% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/EnvironmentPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala index 46e8d376c..0fd88373a 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/EnvironmentPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object EnvironmentPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ErrorPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ErrorPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackage.scala index 087270015..b22a878e4 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ErrorPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, TypeArg, TypeParam} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, TypeArg, TypeParam} +import com.rawlabs.snapi.frontend.rql2.source._ class ErrorPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ErrorPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ErrorPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala index aba13ef4a..029f80e79 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ErrorPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object ErrorPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FloatPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FloatPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackage.scala index 1b600f17a..bad2a8a57 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FloatPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class FloatPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FloatPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FloatPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala index e2b5a3025..38bd4de4b 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FloatPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object FloatPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FunctionPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FunctionPackage.scala similarity index 81% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FunctionPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FunctionPackage.scala index fe51b942d..0aa3e7613 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/FunctionPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FunctionPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.rql2.source.FunType -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.client.api._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.rql2.source.FunType +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class FunctionPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/HttpPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/HttpPackage.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/HttpPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/HttpPackage.scala index 9dc222e4c..e5d3aa060 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/HttpPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/HttpPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.immutable.ListMap diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackage.scala similarity index 90% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackage.scala index 1bd5de0cd..5481b5018 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class IntPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala index d0d3ff511..c1e671226 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object IntPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntervalPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntervalPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackage.scala index e29500972..c82ed0c29 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntervalPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ class IntervalPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntervalPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntervalPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala index bfd758470..00d12335d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/IntervalPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object IntervalPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/JsonPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/JsonPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/JsonPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/JsonPackage.scala index 3be61a6b9..078b87a6d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/JsonPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/JsonPackage.scala @@ -10,14 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, EntryExtensionHelper, @@ -30,10 +31,9 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.source._ -import raw.client.api._ -import raw.inferrer.api._ -import raw.sources.bytestream.inmemory.InMemoryByteStreamLocation +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.utils.sources.bytestream.inmemory.InMemoryByteStreamLocation class JsonPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/KryoPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/KryoPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/KryoPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/KryoPackage.scala index 7022b82fd..9ab8649a0 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/KryoPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/KryoPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.rql2._ -import raw.compiler.rql2.api._ -import raw.compiler.rql2.source._ -import raw.client.api.{EntryDoc, PackageDoc} +import com.rawlabs.compiler.{EntryDoc, PackageDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.source._ class KryoPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LibraryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LibraryPackage.scala similarity index 93% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LibraryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LibraryPackage.scala index 256437746..73c25259f 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LibraryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LibraryPackage.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -//package raw.compiler.rql2.builtin +//package com.rawlabs.snapi.frontend.rql2.builtin // //import com.typesafe.scalalogging.StrictLogging //import raw.api.RawException -//import raw.compiler.{EntryDoc, ExampleDoc, L0, PackageDoc, ParamDoc, TypeDoc} -//import raw.compiler.L0.source.{CallPackageArgNode, L0Arg} -//import raw.compiler.base.source.Type -//import raw.compiler.base.{ExpDecl, ExpDeclParam} -//import raw.compiler.common.CommonCompilerProvider -//import raw.compiler.common.source.{Exp, VoidType} +//import com.rawlabs.snapi.frontend.{EntryDoc, ExampleDoc, L0, PackageDoc, ParamDoc, TypeDoc} +//import com.rawlabs.snapi.frontend.L0.source.{CallPackageArgNode, L0Arg} +//import com.rawlabs.snapi.frontend.base.source.Type +//import com.rawlabs.snapi.frontend.base.{ExpDecl, ExpDeclParam} +//import com.rawlabs.snapi.frontend.common.CommonCompilerProvider +//import com.rawlabs.snapi.frontend.common.source.{Exp, VoidType} //import raw.runtime.JvmEntrypoint -//import raw.compiler.rql2._ -//import raw.compiler.rql2.source._ -//import raw.sources.LocationDescription -//import raw.sources.bytestream.ByteStreamLocationProvider +//import com.rawlabs.snapi.frontend.rql2._ +//import com.rawlabs.snapi.frontend.rql2.source._ +//import com.rawlabs.utils.sources.LocationDescription +//import com.rawlabs.utils.sources.bytestream.ByteStreamLocationProvider // //import java.nio.charset.StandardCharsets //import java.util.concurrent.atomic.AtomicInteger diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ListPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackage.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ListPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackage.scala index bb2b6e976..9f64d1b64 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ListPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.errors.ErrorCompilerMessage -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -31,13 +31,13 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.errors.{ +import com.rawlabs.snapi.frontend.rql2.errors.{ InvalidOrderSpec, ItemsNotComparable, KeyNotComparable, OrderSpecMustFollowOrderingFunction } -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.source._ class ListPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ListPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala similarity index 90% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ListPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala index 4fca9ba8f..24f4969bd 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ListPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object ListPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LocationPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackage.scala similarity index 95% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LocationPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackage.scala index 55e1bd13e..c160f66f9 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LocationPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class LocationPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LocationPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala similarity index 80% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LocationPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala index 1dec654be..0cb382b0d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LocationPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object LocationPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LongPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackage.scala similarity index 90% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LongPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackage.scala index 4aba8f1f7..1a67f078a 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LongPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class LongPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LongPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LongPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala index 94ef55d19..e66499bf0 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/LongPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object LongPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MathPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MathPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MathPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MathPackage.scala index e0cf1c5ba..a08247107 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MathPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MathPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} -import raw.compiler.rql2.source._ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ class MathPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MySQLPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MySQLPackage.scala index 33f85f03b..f124e2be1 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/MySQLPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MySQLPackage.scala @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.api._ -import raw.compiler.rql2.ProgramContext -import raw.compiler.rql2.source._ -import raw.client.api._ -import raw.inferrer.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.ProgramContext +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerProperties, SqlQueryInputFormatDescriptor, SqlTableInferrerProperties, SqlTableInputFormatDescriptor } -import raw.sources.jdbc.mysql.{MySqlServerLocation, MySqlTableLocation} +import com.rawlabs.utils.sources.jdbc.mysql.{MySqlServerLocation, MySqlTableLocation} class MySQLPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullablePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullablePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackage.scala index 2c51a74d2..007e8e7af 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullablePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackage.scala @@ -10,13 +10,22 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.rql2.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, TypeArg, TypeParam} +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ + Arg, + EntryExtension, + ExpArg, + ExpParam, + PackageExtension, + Param, + TypeArg, + TypeParam +} class NullablePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullablePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullablePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala index a58ddce5c..1ec4517c5 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullablePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object NullablePackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullableTryablePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackage.scala similarity index 81% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullableTryablePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackage.scala index 6c804e81d..f398c6738 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullableTryablePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin +import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.typesafe.scalalogging.StrictLogging -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ -import raw.client.api.{EntryDoc, PackageDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class NullableTryablePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullableTryablePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala similarity index 80% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullableTryablePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala index 42db9cb75..fd7e841f2 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/NullableTryablePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object NullableTryablePackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/OraclePackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/OraclePackage.scala index d9273b185..1eed2456f 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/OraclePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/OraclePackage.scala @@ -10,12 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.api.{ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -29,16 +30,15 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.source._ -import raw.compiler.rql2.ProgramContext -import raw.client.api._ -import raw.inferrer.api.{ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.ProgramContext +import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerProperties, SqlQueryInputFormatDescriptor, SqlTableInferrerProperties, SqlTableInputFormatDescriptor } -import raw.sources.jdbc.oracle.{OracleServerLocation, OracleTableLocation} +import com.rawlabs.utils.sources.jdbc.oracle.{OracleServerLocation, OracleTableLocation} class OraclePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/PostgreSQLPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/PostgreSQLPackage.scala index d75a82e00..6e13e65cd 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/PostgreSQLPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/PostgreSQLPackage.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -30,15 +31,14 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.source._ -import raw.client.api._ -import raw.inferrer.api.{ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerProperties, SqlQueryInputFormatDescriptor, SqlTableInferrerProperties, SqlTableInputFormatDescriptor } -import raw.sources.jdbc.pgsql.{PostgresqlServerLocation, PostgresqlTableLocation} +import com.rawlabs.utils.sources.jdbc.pgsql.{PostgresqlServerLocation, PostgresqlTableLocation} class PostgreSQLPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RecordPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackage.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RecordPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackage.scala index ce3885e3b..bc4ff2423 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RecordPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackage.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, ValueParam} -import raw.compiler.rql2.source._ -import raw.compiler.rql2.source.{Rql2RecordType, _} +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, ValueParam} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.source.{Rql2RecordType, _} class RecordPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RecordPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala similarity index 91% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RecordPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala index 2650dc1c6..e4e950b93 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RecordPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object RecordPackageBuilder { object Build { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RegexPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RegexPackage.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RegexPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RegexPackage.scala index 6af32909c..d1f60477d 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/RegexPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RegexPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.client.api._ -import raw.compiler.rql2.source.{ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source.{ Rql2BoolType, Rql2IsNullableTypeProperty, Rql2IsTryableTypeProperty, diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/S3Package.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/S3Package.scala similarity index 85% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/S3Package.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/S3Package.scala index d5ebd11a0..2b79d5335 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/S3Package.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/S3Package.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2.source.{Rql2LocationType, Rql2StringType} -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2.source.{Rql2LocationType, Rql2StringType} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class S3Package extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SQLServerPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SQLServerPackage.scala index 5fa5a1230..28b164737 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SQLServerPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SQLServerPackage.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -30,15 +31,14 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.compiler.rql2.source._ -import raw.client.api._ -import raw.inferrer.api.{ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerProperties, SqlQueryInputFormatDescriptor, SqlTableInferrerProperties, SqlTableInputFormatDescriptor } -import raw.sources.jdbc.sqlserver.{SqlServerServerLocation, SqlServerTableLocation} +import com.rawlabs.utils.sources.jdbc.sqlserver.{SqlServerServerLocation, SqlServerTableLocation} class SQLServerPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ShortPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ShortPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackage.scala index 88c48d1a5..ad28fd590 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ShortPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.source._ class ShortPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ShortPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala similarity index 78% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ShortPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala index d5756086a..8182db6cd 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/ShortPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object ShortPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SnowflakePackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SnowflakePackage.scala index 283ef0259..230b80e76 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SnowflakePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SnowflakePackage.scala @@ -10,14 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, ExpArg, @@ -35,14 +36,13 @@ import raw.compiler.rql2.api.{ ValueArg, ValueParam } -import raw.client.api._ -import raw.inferrer.api.{ +import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerProperties, SqlQueryInputFormatDescriptor, SqlTableInferrerProperties, SqlTableInputFormatDescriptor } -import raw.sources.jdbc.snowflake.{SnowflakeServerLocation, SnowflakeTableLocation} +import com.rawlabs.utils.sources.jdbc.snowflake.{SnowflakeServerLocation, SnowflakeTableLocation} class SnowflakePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/StringPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/StringPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/StringPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/StringPackage.scala index 0714cf325..75a3f6bf3 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/StringPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/StringPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} -import raw.compiler.rql2.source._ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ class StringPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SuccessPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackage.scala similarity index 77% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SuccessPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackage.scala index 4bde1c198..a7cf9e74b 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SuccessPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.rql2.source.{Rql2IsTryableTypeProperty, Rql2TypeWithProperties} -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import raw.client.api.{EntryDoc, PackageDoc} +import com.rawlabs.compiler.{EntryDoc, PackageDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.rql2.source.{Rql2IsTryableTypeProperty, Rql2TypeWithProperties} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class SuccessPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SuccessPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala similarity index 79% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SuccessPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala index e5fe4b854..b6cf33cbf 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/SuccessPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object SuccessPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TestPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TestPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TestPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TestPackage.scala index 1b64e15cd..7d93240c3 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TestPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TestPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.source.Type -import raw.compiler.rql2._ -import raw.compiler.rql2.api._ -import raw.compiler.rql2.source._ -import raw.client.api.{EntryDoc, PackageDoc} -import raw.compiler.common.source.Exp +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, PackageDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.common.source.Exp class TestPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackage.scala index baeb40005..ef0c2e5e3 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackage.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.rql2.api.{PackageExtension, ShortEntryExtension} -import raw.compiler.rql2.source._ +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.immutable.ListMap diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala index dd2f1baca..dac4e0318 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import java.time.{LocalDate, LocalTime} diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimestampPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimestampPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackage.scala index be14cd2ae..826bc6268 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimestampPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} import scala.collection.immutable.ListMap diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimestampPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala similarity index 89% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimestampPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala index 289fdfab3..1155215cb 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TimestampPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import java.time.LocalDateTime diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackage.scala similarity index 93% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackage.scala index 65d78eba4..b40008141 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.client.api._ -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.rql2.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param} +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param} class TryPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TryPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala similarity index 85% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TryPackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala index cb7788c94..14ef0d695 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TryPackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object TryPackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TypePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackage.scala similarity index 94% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TypePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackage.scala index aacb6420e..32ca6f27b 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TypePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.client.api._ -import raw.compiler.base.source.{AnythingType, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, TypeArg, TypeParam} -import raw.compiler.rql2.source._ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, TypeArg, TypeParam} +import com.rawlabs.snapi.frontend.rql2.source._ class TypePackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TypePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala similarity index 82% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TypePackageBuilder.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala index 5adec6be5..b4aae24d5 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/TypePackageBuilder.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.builtin -import raw.compiler.base.source.Type -import raw.compiler.common.source._ -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ object TypePackageBuilder { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/XmlPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/XmlPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/XmlPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/XmlPackage.scala index 1a240c6b0..74caeb870 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/builtin/XmlPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/XmlPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.builtin - -import raw.compiler.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.client.api._ -import raw.compiler.rql2._ -import raw.compiler.rql2.api.{ +package com.rawlabs.snapi.frontend.rql2.builtin + +import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} +import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.api.{ Arg, EntryExtension, EntryExtensionHelper, @@ -28,8 +28,8 @@ import raw.compiler.rql2.api.{ TypeParam, ValueParam } -import raw.compiler.rql2.source._ -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api._ class XmlPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/errors/Errors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/Errors.scala similarity index 97% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/errors/Errors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/Errors.scala index 3c4982e67..9833cedc5 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/errors/Errors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/Errors.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.errors +package com.rawlabs.snapi.frontend.rql2.errors -import raw.compiler.base.errors.ErrorCompilerMessage -import raw.compiler.base.source.{BaseNode, Type} +import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage +import com.rawlabs.snapi.frontend.base.source.{BaseNode, Type} object KeyNotComparable { val message: String = "key is not comparable" diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/errors/ErrorsPrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/ErrorsPrettyPrinter.scala similarity index 90% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/errors/ErrorsPrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/ErrorsPrettyPrinter.scala index ed418f03b..550bb054e 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/errors/ErrorsPrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/ErrorsPrettyPrinter.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.errors +package com.rawlabs.snapi.frontend.rql2.errors -import raw.compiler.base.errors.{MissingSecretWarning, UnexpectedType} -import raw.compiler.base.source.BaseNode -import raw.compiler.{base, rql2} -import raw.compiler.rql2.source.{ExpectedProjType, PackageType} +import com.rawlabs.snapi.frontend.base.errors.{MissingSecretWarning, UnexpectedType} +import com.rawlabs.snapi.frontend.base.source.BaseNode +import com.rawlabs.snapi.frontend.{base, rql2} +import com.rawlabs.snapi.frontend.rql2.source.{ExpectedProjType, PackageType} trait ErrorsPrettyPrinter extends base.errors.ErrorsPrettyPrinter with rql2.source.SourcePrettyPrinter { diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/lsp/CompilerLspService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/CompilerLspService.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/lsp/CompilerLspService.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/CompilerLspService.scala index 399f909be..0a8a17fb7 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/lsp/CompilerLspService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/CompilerLspService.scala @@ -10,18 +10,39 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.lsp +package com.rawlabs.snapi.frontend.rql2.lsp +import com.rawlabs.compiler +import com.rawlabs.compiler.{ + AutoCompleteResponse, + Completion, + ErrorPosition, + ErrorRange, + FieldCompletion, + FunParamCompletion, + GoToDefinitionResponse, + HoverResponse, + LetBindCompletion, + LetFunCompletion, + LetFunRecCompletion, + Message, + PackageCompletion, + PackageEntryCompletion, + Pos, + ProgramEnvironment, + RenameResponse, + TypeCompletion, + ValidateResponse +} import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} -import raw.client.api._ -import raw.compiler.base.errors.CompilationMessageMapper -import raw.compiler.base.source.{BaseIdnNode, BaseNode} -import raw.compiler.common.source._ -import raw.compiler.rql2._ -import raw.compiler.rql2.source._ -import raw.compiler.rql2.errors.ErrorsPrettyPrinter +import com.rawlabs.snapi.frontend.base.errors.CompilationMessageMapper +import com.rawlabs.snapi.frontend.base.source.{BaseIdnNode, BaseNode} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.errors.ErrorsPrettyPrinter import scala.util.Try diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/lsp/LspSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala similarity index 88% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/lsp/LspSyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala index 2bba97c6f..4e92b9c36 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/lsp/LspSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.lsp +package com.rawlabs.snapi.frontend.rql2.lsp import org.bitbucket.inkytonik.kiama.util.Positions -import raw.compiler.base.source.{BaseProgram, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.{FrontendSyntaxAnalyzer, ParsedNamedAttribute, ParsedUnnamedAttribute} -import raw.compiler.rql2.FrontendSyntaxAnalyzerTokens._ -import raw.compiler.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} -import raw.compiler.rql2.source._ +import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.{FrontendSyntaxAnalyzer, ParsedNamedAttribute, ParsedUnnamedAttribute} +import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzerTokens._ +import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ /** * Version of the FrontendSyntaxAnalyzer that accepts "broken code" but still tries to parse it successfully, diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourceCommentsPrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourceCommentsPrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala index 817a5a9c4..2985a7126 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourceCommentsPrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.source +package com.rawlabs.snapi.frontend.rql2.source import org.bitbucket.inkytonik.kiama.output.{LeftAssoc, NonAssoc, PrettyExpression, RightAssoc} import org.bitbucket.inkytonik.kiama.util.Trampolines.Done import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} -import raw.compiler.base.source.BaseNode -import raw.compiler.rql2.antlr4.{CommentsAntlrSyntaxAnalyzer, NodeComments} -import raw.compiler.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.base.source.BaseNode +import com.rawlabs.snapi.frontend.rql2.antlr4.{CommentsAntlrSyntaxAnalyzer, NodeComments} +import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} import java.util import scala.collection.JavaConverters._ diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourcePrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourcePrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala index cc72ad587..a7da8a855 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourcePrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala @@ -10,15 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.source +package com.rawlabs.snapi.frontend.rql2.source +import com.rawlabs.utils.core.RawUtils import org.bitbucket.inkytonik.kiama.output._ -import raw.compiler.base -import raw.compiler.base.source.{AnythingType, BaseNode, Type} -import raw.compiler.common.source._ -import raw.compiler.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} -import raw.compiler.rql2.{Keywords, Rql2TypeUtils} -import raw.utils._ +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} +import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.{Keywords, Rql2TypeUtils} +import com.rawlabs.utils.core._ import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourceTree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala index da92d63f4..1e37ad6cc 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/source/SourceTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2.source +package com.rawlabs.snapi.frontend.rql2.source import org.bitbucket.inkytonik.kiama.output._ -import raw.compiler.base.source.Type -import raw.compiler.common.source._ +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.common.source._ /////////////////////////////////////////////////////////////////////////// // RQL2 diff --git a/snapi-frontend/src/main/scala/raw/compiler/utils/Attribution.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/Attribution.scala similarity index 98% rename from snapi-frontend/src/main/scala/raw/compiler/utils/Attribution.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/Attribution.scala index 2fdf2a184..164979951 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/utils/Attribution.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/Attribution.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.utils +package com.rawlabs.snapi.frontend.utils import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.attribution.Attribute diff --git a/snapi-frontend/src/main/scala/raw/compiler/utils/ExtraRewriters.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/ExtraRewriters.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/utils/ExtraRewriters.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/ExtraRewriters.scala index 14fdbf891..6fe014aa9 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/utils/ExtraRewriters.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/ExtraRewriters.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.utils +package com.rawlabs.snapi.frontend.utils import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.id diff --git a/snapi-frontend/src/main/scala/raw/compiler/utils/package.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/package.scala similarity index 96% rename from snapi-frontend/src/main/scala/raw/compiler/utils/package.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/package.scala index 7def9a357..7ffb3cfa8 100644 --- a/snapi-frontend/src/main/scala/raw/compiler/utils/package.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/package.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler +package com.rawlabs.snapi.frontend import java.nio.file.Path diff --git a/snapi-frontend/src/main/scala/raw/compiler/common/PhaseDescriptor.scala b/snapi-frontend/src/main/scala/raw/compiler/common/PhaseDescriptor.scala deleted file mode 100644 index 24abe494b..000000000 --- a/snapi-frontend/src/main/scala/raw/compiler/common/PhaseDescriptor.scala +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.compiler.common - -import raw.compiler.common.source._ - -final case class PhaseDescriptor(name: String, phase: Class[raw.compiler.base.PipelinedPhase[SourceProgram]]) - extends raw.compiler.base.PhaseDescriptor[SourceProgram] { - - override def instance( - cur: raw.compiler.base.Phase[SourceProgram], - programContext: raw.compiler.base.ProgramContext - ): raw.compiler.base.PipelinedPhase[SourceProgram] = { - phase - .getConstructor( - classOf[raw.compiler.base.Phase[SourceProgram]], - classOf[String], - classOf[raw.compiler.base.ProgramContext] - ) - .newInstance(cur, name, programContext) - } - -} diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/EntryExtensionProvider.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/api/EntryExtensionProvider.scala deleted file mode 100644 index e3b411edb..000000000 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/EntryExtensionProvider.scala +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.compiler.rql2.api - -object EntryExtensionProvider { - - private val entryExtensions: Array[EntryExtension] = Array( - new raw.compiler.rql2.builtin.AwsV4SignedRequest, - new raw.compiler.rql2.builtin.FromStringBinaryEntryExtension, - new raw.compiler.rql2.builtin.BinaryReadEntry, - new raw.compiler.rql2.builtin.BinaryBase64Entry, - new raw.compiler.rql2.builtin.ByteFromEntry, - new raw.compiler.rql2.builtin.EmptyCollectionEntry, - new raw.compiler.rql2.builtin.BuildCollectionEntry, - new raw.compiler.rql2.builtin.FilterCollectionEntry, - new raw.compiler.rql2.builtin.AvgCollectionEntry, - new raw.compiler.rql2.builtin.OrderByCollectionEntry, - new raw.compiler.rql2.builtin.TransformCollectionEntry, - new raw.compiler.rql2.builtin.DistinctCollectionEntry, - new raw.compiler.rql2.builtin.CountCollectionEntry, - new raw.compiler.rql2.builtin.TupleAvgCollectionEntry, - new raw.compiler.rql2.builtin.MinCollectionEntry, - new raw.compiler.rql2.builtin.MaxCollectionEntry, - new raw.compiler.rql2.builtin.SumCollectionEntry, - new raw.compiler.rql2.builtin.FirstCollectionEntry, - new raw.compiler.rql2.builtin.FindFirstCollectionEntry, - new raw.compiler.rql2.builtin.LastCollectionEntry, - new raw.compiler.rql2.builtin.FindLastCollectionEntry, - new raw.compiler.rql2.builtin.TakeCollectionEntry, - new raw.compiler.rql2.builtin.ExplodeCollectionEntry, - new raw.compiler.rql2.builtin.UnnestCollectionEntry, - new raw.compiler.rql2.builtin.FromCollectionEntry, - new raw.compiler.rql2.builtin.GroupCollectionEntry, - new raw.compiler.rql2.builtin.JoinCollectionEntry, - new raw.compiler.rql2.builtin.InternalJoinCollectionEntry, - new raw.compiler.rql2.builtin.EquiJoinCollectionEntry, - new raw.compiler.rql2.builtin.InternalEquiJoinCollectionEntry, - new raw.compiler.rql2.builtin.UnionCollectionEntry, - new raw.compiler.rql2.builtin.ExistsCollectionEntry, - new raw.compiler.rql2.builtin.ContainsCollectionEntry, - new raw.compiler.rql2.builtin.ZipCollectionEntry, - new raw.compiler.rql2.builtin.MkStringCollectionEntry, - new raw.compiler.rql2.builtin.CsvInferAndReadEntry, - new raw.compiler.rql2.builtin.CsvReadEntry, - new raw.compiler.rql2.builtin.CsvInferAndParseEntry, - new raw.compiler.rql2.builtin.CsvParseEntry, - new raw.compiler.rql2.builtin.DateBuildEntry, - new raw.compiler.rql2.builtin.DateFromEpochDayEntry, - new raw.compiler.rql2.builtin.DateFromTimestampEntry, - new raw.compiler.rql2.builtin.DateParseEntry, - new raw.compiler.rql2.builtin.DateNowEntry, - new raw.compiler.rql2.builtin.DateYearEntry, - new raw.compiler.rql2.builtin.DateMonthEntry, - new raw.compiler.rql2.builtin.DateDayEntry, - new raw.compiler.rql2.builtin.DateSubtractEntry, - new raw.compiler.rql2.builtin.DateAddIntervalEntry, - new raw.compiler.rql2.builtin.DateSubtractIntervalEntry, - new raw.compiler.rql2.builtin.DecimalFromEntry, - new raw.compiler.rql2.builtin.DecimalRoundEntry, - new raw.compiler.rql2.builtin.DoubleFromEntry, - new raw.compiler.rql2.builtin.EnvironmentSecretEntry, - new raw.compiler.rql2.builtin.EnvironmentScopesEntry, - new raw.compiler.rql2.builtin.EnvironmentParameterEntry, - new raw.compiler.rql2.builtin.ErrorBuildEntry, - new raw.compiler.rql2.builtin.ErrorBuildWithTypeEntry, - new raw.compiler.rql2.builtin.ErrorGetEntry, - new raw.compiler.rql2.builtin.FloatFromEntry, - new raw.compiler.rql2.builtin.FunctionInvokeAfterEntry, - new raw.compiler.rql2.builtin.HttpReadEntry, - new raw.compiler.rql2.builtin.HttpUrlEncodeEntry, - new raw.compiler.rql2.builtin.HttpUrlDecodeEntry, - new raw.compiler.rql2.builtin.HttpPutEntry, - new raw.compiler.rql2.builtin.HttpDeleteEntry, - new raw.compiler.rql2.builtin.HttpGetEntry, - new raw.compiler.rql2.builtin.HttpHeadEntry, - new raw.compiler.rql2.builtin.HttpOptionsEntry, - new raw.compiler.rql2.builtin.HttpPatchEntry, - new raw.compiler.rql2.builtin.HttpPostEntry, - new raw.compiler.rql2.builtin.BuildIntervalEntry, - new raw.compiler.rql2.builtin.IntervalToMillisEntryExtension, - new raw.compiler.rql2.builtin.IntervalFromMillisEntryExtension, - new raw.compiler.rql2.builtin.IntervalParseEntryExtension, - new raw.compiler.rql2.builtin.IntervalYearsEntry, - new raw.compiler.rql2.builtin.IntervalMonthsEntry, - new raw.compiler.rql2.builtin.IntervalWeeksEntry, - new raw.compiler.rql2.builtin.IntervalDaysEntry, - new raw.compiler.rql2.builtin.IntervalHoursEntry, - new raw.compiler.rql2.builtin.IntervalMinutesEntry, - new raw.compiler.rql2.builtin.IntervalSecondsEntry, - new raw.compiler.rql2.builtin.IntervalMillisEntry, - new raw.compiler.rql2.builtin.IntFromEntry, - new raw.compiler.rql2.builtin.IntRangeEntry, - new raw.compiler.rql2.builtin.InferAndReadJsonEntry, - new raw.compiler.rql2.builtin.ReadJsonEntry, - new raw.compiler.rql2.builtin.InferAndParseJsonEntry, - new raw.compiler.rql2.builtin.ParseJsonEntry, - new raw.compiler.rql2.builtin.PrintJsonEntry, - new raw.compiler.rql2.builtin.KryoEncodeEntry, - new raw.compiler.rql2.builtin.KryoDecodeEntry, - new raw.compiler.rql2.builtin.EmptyListEntry, - new raw.compiler.rql2.builtin.BuildListEntry, - new raw.compiler.rql2.builtin.GetListEntry, - new raw.compiler.rql2.builtin.FilterListEntry, - new raw.compiler.rql2.builtin.TransformListEntry, - new raw.compiler.rql2.builtin.TakeListEntry, - new raw.compiler.rql2.builtin.SumListEntry, - new raw.compiler.rql2.builtin.MaxListEntry, - new raw.compiler.rql2.builtin.MinListEntry, - new raw.compiler.rql2.builtin.FirstListEntry, - new raw.compiler.rql2.builtin.FindFirstListEntry, - new raw.compiler.rql2.builtin.LastListEntry, - new raw.compiler.rql2.builtin.FindLastListEntry, - new raw.compiler.rql2.builtin.CountListEntry, - new raw.compiler.rql2.builtin.ExplodeListEntry, - new raw.compiler.rql2.builtin.UnnestListEntry, - new raw.compiler.rql2.builtin.FromListEntry, - new raw.compiler.rql2.builtin.UnsafeFromListEntry, - new raw.compiler.rql2.builtin.GroupListEntry, - new raw.compiler.rql2.builtin.JoinListEntry, - new raw.compiler.rql2.builtin.EquiJoinListEntry, - new raw.compiler.rql2.builtin.OrderByListEntry, - new raw.compiler.rql2.builtin.DistinctListEntry, - new raw.compiler.rql2.builtin.UnionListEntry, - new raw.compiler.rql2.builtin.AvgListEntry, - new raw.compiler.rql2.builtin.ExistsListEntry, - new raw.compiler.rql2.builtin.ContainsListEntry, - new raw.compiler.rql2.builtin.ZipListEntry, - new raw.compiler.rql2.builtin.MkStringListEntry, - new raw.compiler.rql2.builtin.LocationFromStringEntry, - new raw.compiler.rql2.builtin.LocationDescribeEntry, - new raw.compiler.rql2.builtin.LocationLsEntry, - new raw.compiler.rql2.builtin.LocationLlEntry, - new raw.compiler.rql2.builtin.LongFromEntry, - new raw.compiler.rql2.builtin.LongRangeEntry, - new raw.compiler.rql2.builtin.MathPiEntry, - new raw.compiler.rql2.builtin.MathRandomEntry, - new raw.compiler.rql2.builtin.MathPowerEntry, - new raw.compiler.rql2.builtin.MathAtn2Entry, - new raw.compiler.rql2.builtin.MathAbsEntry, - new raw.compiler.rql2.builtin.MathAcosEntry, - new raw.compiler.rql2.builtin.MathAsinEntry, - new raw.compiler.rql2.builtin.MathAtanEntry, - new raw.compiler.rql2.builtin.MathCeilingEntry, - new raw.compiler.rql2.builtin.MathCosEntry, - new raw.compiler.rql2.builtin.MathCotEntry, - new raw.compiler.rql2.builtin.MathDegreesEntry, - new raw.compiler.rql2.builtin.MathExpEntry, - new raw.compiler.rql2.builtin.MathLogEntry, - new raw.compiler.rql2.builtin.MathLog10Entry, - new raw.compiler.rql2.builtin.MathRadiansEntry, - new raw.compiler.rql2.builtin.MathSignEntry, - new raw.compiler.rql2.builtin.MathSinEntry, - new raw.compiler.rql2.builtin.MathSqrtEntry, - new raw.compiler.rql2.builtin.MathTanEntry, - new raw.compiler.rql2.builtin.MathSquareEntry, - new raw.compiler.rql2.builtin.MathFloorEntry, - new raw.compiler.rql2.builtin.MySQLInferAndReadEntry, - new raw.compiler.rql2.builtin.MySQLReadEntry, - new raw.compiler.rql2.builtin.MySQLInferAndQueryEntry, - new raw.compiler.rql2.builtin.MySQLQueryEntry, - new raw.compiler.rql2.builtin.NullableEmptyEntry, - new raw.compiler.rql2.builtin.NullableBuildEntry, - new raw.compiler.rql2.builtin.NullableIsNullEntry, - new raw.compiler.rql2.builtin.NullableUnsafeGetEntry, - new raw.compiler.rql2.builtin.NullableTransformEntry, - new raw.compiler.rql2.builtin.FlatMapNullableTryableEntry, - new raw.compiler.rql2.builtin.OracleInferAndReadEntry, - new raw.compiler.rql2.builtin.OracleReadEntry, - new raw.compiler.rql2.builtin.OracleInferAndQueryEntry, - new raw.compiler.rql2.builtin.OracleQueryEntry, - new raw.compiler.rql2.builtin.PostgreSQLInferAndReadEntry, - new raw.compiler.rql2.builtin.PostgreSQLReadEntry, - new raw.compiler.rql2.builtin.PostgreSQLInferAndQueryEntry, - new raw.compiler.rql2.builtin.PostgreSQLQueryEntry, - new raw.compiler.rql2.builtin.RecordBuildEntry, - new raw.compiler.rql2.builtin.RecordConcatEntry, - new raw.compiler.rql2.builtin.RecordFieldsEntry, - new raw.compiler.rql2.builtin.RecordAddFieldEntry, - new raw.compiler.rql2.builtin.RecordRemoveFieldEntry, - new raw.compiler.rql2.builtin.RecordGetFieldByIndexEntry, - new raw.compiler.rql2.builtin.RegexReplaceEntry, - new raw.compiler.rql2.builtin.RegexMatchesEntry, - new raw.compiler.rql2.builtin.RegexFirstMatchInEntry, - new raw.compiler.rql2.builtin.RegexGroupsEntry, - new raw.compiler.rql2.builtin.S3BuildEntry, - new raw.compiler.rql2.builtin.ShortFromEntry, - new raw.compiler.rql2.builtin.SnowflakeInferAndReadEntry, - new raw.compiler.rql2.builtin.SnowflakeReadEntry, - new raw.compiler.rql2.builtin.SnowflakeInferAndQueryEntry, - new raw.compiler.rql2.builtin.SnowflakeQueryEntry, - new raw.compiler.rql2.builtin.SQLServerInferAndReadEntry, - new raw.compiler.rql2.builtin.SQLServerReadEntry, - new raw.compiler.rql2.builtin.SQLServerInferAndQueryEntry, - new raw.compiler.rql2.builtin.SQLServerQueryEntry, - new raw.compiler.rql2.builtin.StringFromEntry, - new raw.compiler.rql2.builtin.StringReadEntry, - new raw.compiler.rql2.builtin.StringContainsEntry, - new raw.compiler.rql2.builtin.StringTrimEntry, - new raw.compiler.rql2.builtin.StringLTrimEntry, - new raw.compiler.rql2.builtin.StringRTrimEntry, - new raw.compiler.rql2.builtin.StringReplaceEntry, - new raw.compiler.rql2.builtin.StringReverseEntry, - new raw.compiler.rql2.builtin.StringReplicateEntry, - new raw.compiler.rql2.builtin.StringUpperEntry, - new raw.compiler.rql2.builtin.StringLowerEntry, - new raw.compiler.rql2.builtin.StringSplitEntry, - new raw.compiler.rql2.builtin.StringLengthEntry, - new raw.compiler.rql2.builtin.StringSubStringEntry, - new raw.compiler.rql2.builtin.StringCountSubStringEntry, - new raw.compiler.rql2.builtin.StringStartsWithEntry, - new raw.compiler.rql2.builtin.StringEmptyEntry, - new raw.compiler.rql2.builtin.Base64EntryExtension, - new raw.compiler.rql2.builtin.StringEncodeEntry, - new raw.compiler.rql2.builtin.StringDecodeEntry, - new raw.compiler.rql2.builtin.StringLevenshteinDistanceEntry, - new raw.compiler.rql2.builtin.StringReadLinesEntry, - new raw.compiler.rql2.builtin.StringCapitalizeEntry, - new raw.compiler.rql2.builtin.SuccessBuildEntry, - new raw.compiler.rql2.builtin.MandatoryExpArgsEntry, - new raw.compiler.rql2.builtin.MandatoryValueArgsEntry, - new raw.compiler.rql2.builtin.OptionalExpArgsTestEntry, - new raw.compiler.rql2.builtin.OptionalValueArgsTestEntry, - new raw.compiler.rql2.builtin.OptionalValueArgSugar, - new raw.compiler.rql2.builtin.VarValueArgSugarTestEntry, - new raw.compiler.rql2.builtin.VarExpArgsTestEntry, - new raw.compiler.rql2.builtin.VarValueArgsTestEntry, - new raw.compiler.rql2.builtin.VarNullableStringValueTestEntry, - new raw.compiler.rql2.builtin.VarNullableStringExpTestEntry, - new raw.compiler.rql2.builtin.StrictArgsTestEntry, - new raw.compiler.rql2.builtin.StrictArgsColPassThroughTestEntry, - new raw.compiler.rql2.builtin.StrictArgsColConsumeTestEntry, - new raw.compiler.rql2.builtin.ByteValueArgTestEntry, - new raw.compiler.rql2.builtin.ShortValueArgTestEntry, - new raw.compiler.rql2.builtin.IntValueArgTestEntry, - new raw.compiler.rql2.builtin.LongValueArgTestEntry, - new raw.compiler.rql2.builtin.FloatValueArgTestEntry, - new raw.compiler.rql2.builtin.DoubleValueArgTestEntry, - new raw.compiler.rql2.builtin.StringValueArgTestEntry, - new raw.compiler.rql2.builtin.BoolValueArgTestEntry, - new raw.compiler.rql2.builtin.DateValueArgTestEntry, - new raw.compiler.rql2.builtin.TimeValueArgTestEntry, - new raw.compiler.rql2.builtin.TimestampValueArgTestEntry, - new raw.compiler.rql2.builtin.IntervalValueArgTestEntry, - new raw.compiler.rql2.builtin.RecordValueArgTestEntry, - new raw.compiler.rql2.builtin.ListValueArgTestEntry, - new raw.compiler.rql2.builtin.TimeBuildEntry, - new raw.compiler.rql2.builtin.TimeParseEntry, - new raw.compiler.rql2.builtin.TimeNowEntry, - new raw.compiler.rql2.builtin.TimeHourEntry, - new raw.compiler.rql2.builtin.TimeMinuteEntry, - new raw.compiler.rql2.builtin.TimeSecondEntry, - new raw.compiler.rql2.builtin.TimeMillisEntry, - new raw.compiler.rql2.builtin.TimeSubtractEntry, - new raw.compiler.rql2.builtin.TimeAddIntervalEntry, - new raw.compiler.rql2.builtin.TimeSubtractIntervalEntry, - new raw.compiler.rql2.builtin.TimestampBuildEntry, - new raw.compiler.rql2.builtin.TimestampFromDateEntry, - new raw.compiler.rql2.builtin.TimestampParseEntry, - new raw.compiler.rql2.builtin.TimestampNowEntry, - new raw.compiler.rql2.builtin.TimestampRangeEntry, - new raw.compiler.rql2.builtin.TimestampYearEntry, - new raw.compiler.rql2.builtin.TimestampMonthEntry, - new raw.compiler.rql2.builtin.TimestampDayEntry, - new raw.compiler.rql2.builtin.TimestampHourEntry, - new raw.compiler.rql2.builtin.TimestampMinuteEntry, - new raw.compiler.rql2.builtin.TimestampSecondEntry, - new raw.compiler.rql2.builtin.TimestampMillisEntry, - new raw.compiler.rql2.builtin.TimestampFromUnixTimestampEntry, - new raw.compiler.rql2.builtin.TimestampToUnixTimestampEntry, - new raw.compiler.rql2.builtin.TimestampTimeBucketEntry, - new raw.compiler.rql2.builtin.TimestampSubtractEntry, - new raw.compiler.rql2.builtin.TimestampAddIntervalEntry, - new raw.compiler.rql2.builtin.TimestampSubtractIntervalEntry, - new raw.compiler.rql2.builtin.TryTransformEntry, - new raw.compiler.rql2.builtin.TryIsErrorEntry, - new raw.compiler.rql2.builtin.TryIsSuccessEntry, - new raw.compiler.rql2.builtin.TryFlatMapEntry, - new raw.compiler.rql2.builtin.TryUnsafeGetEntry, - new raw.compiler.rql2.builtin.TypeCastEntry, - new raw.compiler.rql2.builtin.TypeProtectCastEntry, - new raw.compiler.rql2.builtin.TypeEmptyEntry, - new raw.compiler.rql2.builtin.TypeMatchEntry, - new raw.compiler.rql2.builtin.InferAndReadXmlEntry, - new raw.compiler.rql2.builtin.ReadXmlEntry, - new raw.compiler.rql2.builtin.ParseXmlEntry - ) - - def getEntries(name: String): Array[EntryExtension] = { - entryExtensions.filter(_.packageName == name) - } - -} diff --git a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtensionProvider.scala b/snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtensionProvider.scala deleted file mode 100644 index 05c17947b..000000000 --- a/snapi-frontend/src/main/scala/raw/compiler/rql2/api/PackageExtensionProvider.scala +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.compiler.rql2.api - -import raw.compiler.rql2.PackageEntity - -object PackageExtensionProvider { - - private val packageExtensions: Array[PackageExtension] = Array( - new raw.compiler.rql2.builtin.BytePackage, - new raw.compiler.rql2.builtin.ShortPackage, - new raw.compiler.rql2.builtin.IntPackage, - new raw.compiler.rql2.builtin.LongPackage, - new raw.compiler.rql2.builtin.TimestampPackage, - new raw.compiler.rql2.builtin.DatePackage, - new raw.compiler.rql2.builtin.TimePackage, - new raw.compiler.rql2.builtin.RegexPackage, - new raw.compiler.rql2.builtin.StringPackage, - new raw.compiler.rql2.builtin.MathPackage, - new raw.compiler.rql2.builtin.CsvPackage, - new raw.compiler.rql2.builtin.CollectionPackage, - new raw.compiler.rql2.builtin.RecordPackage, - new raw.compiler.rql2.builtin.TypePackage, - new raw.compiler.rql2.builtin.LocationPackage, - new raw.compiler.rql2.builtin.ListPackage, - new raw.compiler.rql2.builtin.FloatPackage, - new raw.compiler.rql2.builtin.DoublePackage, - new raw.compiler.rql2.builtin.DecimalPackage, - new raw.compiler.rql2.builtin.BinaryPackage, - new raw.compiler.rql2.builtin.IntervalPackage, - new raw.compiler.rql2.builtin.JsonPackage, - new raw.compiler.rql2.builtin.XmlPackage, - new raw.compiler.rql2.builtin.ErrorPackage, - new raw.compiler.rql2.builtin.SuccessPackage, - new raw.compiler.rql2.builtin.NullablePackage, - new raw.compiler.rql2.builtin.TryPackage, - new raw.compiler.rql2.builtin.NullableTryablePackage, - new raw.compiler.rql2.builtin.EnvironmentPackage, - new raw.compiler.rql2.builtin.HttpPackage, - new raw.compiler.rql2.builtin.S3Package, - new raw.compiler.rql2.builtin.PostgreSQLPackage, - new raw.compiler.rql2.builtin.OraclePackage, - new raw.compiler.rql2.builtin.SQLServerPackage, - new raw.compiler.rql2.builtin.MySQLPackage, - new raw.compiler.rql2.builtin.SnowflakePackage, - new raw.compiler.rql2.builtin.FunctionPackage, - new raw.compiler.rql2.builtin.AwsPackage, - new raw.compiler.rql2.builtin.TestPackage, - new raw.compiler.rql2.builtin.KryoPackage - ) - - val names: Array[String] = packageExtensions.map(_.name) - - val packages: Array[PackageEntity] = packageExtensions.map(s => new PackageEntity(s)) - - def getPackage(name: String): Option[PackageExtension] = { - packageExtensions.collectFirst { case p if p.name == name => p } - } - -} diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/InferrerBufferedSeekableIsTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/InferrerBufferedSeekableIsTest.scala similarity index 94% rename from snapi-frontend/src/test/scala/raw/inferrer/local/InferrerBufferedSeekableIsTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/InferrerBufferedSeekableIsTest.scala index 983e51712..92a170f78 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/InferrerBufferedSeekableIsTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/InferrerBufferedSeekableIsTest.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local import org.scalatest.funsuite.AnyFunSuite -import raw.inferrer.local.auto.InferrerBufferedSeekableIS -import raw.sources.bytestream.api.SeekableInputStream +import com.rawlabs.snapi.frontend.inferrer.local.auto.InferrerBufferedSeekableIS +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream import java.nio.ByteBuffer diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/LocalInferrerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala similarity index 96% rename from snapi-frontend/src/test/scala/raw/inferrer/local/LocalInferrerTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala index f94e17ca2..9e9bdfe7b 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/LocalInferrerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTest.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local +import com.rawlabs.utils.core.{RawTestSuite, RawUtils, SettingsTestContext} import com.typesafe.scalalogging.StrictLogging -import raw.utils._ -import raw.inferrer.api._ -import raw.sources.api._ -import raw.sources.filesystem.local.LocalPath +import com.rawlabs.utils.core._ +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.utils.sources.api._ +import com.rawlabs.utils.sources.filesystem.local.LocalPath import java.io._ import java.util.concurrent.{SynchronousQueue, ThreadPoolExecutor, TimeUnit} diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/LocalInferrerTestContext.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTestContext.scala similarity index 77% rename from snapi-frontend/src/test/scala/raw/inferrer/local/LocalInferrerTestContext.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTestContext.scala index 72a2018bf..c9cdeb70d 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/LocalInferrerTestContext.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerTestContext.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} import org.scalatest.BeforeAndAfterAll -import raw.utils.{RawTestSuite, SettingsTestContext} trait LocalInferrerTestContext extends BeforeAndAfterAll { this: RawTestSuite with SettingsTestContext => @@ -21,7 +21,7 @@ trait LocalInferrerTestContext extends BeforeAndAfterAll { override def beforeAll(): Unit = { super.beforeAll() - property("raw.inferrer.impl", "local") + property("raw.snapi.frontend.inferrer.impl", "local") } } diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/RD10260.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260.scala similarity index 88% rename from snapi-frontend/src/test/scala/raw/inferrer/local/RD10260.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260.scala index ff3b914fd..af260cee4 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/RD10260.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api._ -import raw.inferrer.local.json.JsonInferrer -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local.json.JsonInferrer import java.io.StringReader class RD10260 extends RawTestSuite with SettingsTestContext with StrictLogging { diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/RD10439.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439.scala similarity index 82% rename from snapi-frontend/src/test/scala/raw/inferrer/local/RD10439.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439.scala index b7126ff96..c65477152 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/RD10439.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api._ -import raw.inferrer.local.jdbc.JdbcInferrer -import raw.sources.jdbc.mysql.{MySqlClient, MySqlTableLocation} -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local.jdbc.JdbcInferrer +import com.rawlabs.utils.sources.jdbc.mysql.{MySqlClient, MySqlTableLocation} class RD10439 extends RawTestSuite with SettingsTestContext with StrictLogging { diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/RD3852.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852.scala similarity index 74% rename from snapi-frontend/src/test/scala/raw/inferrer/local/RD3852.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852.scala index 11e3128a5..ae66aeeec 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/RD3852.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852.scala @@ -10,13 +10,17 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local +import com.rawlabs.utils.core.{RawTestSuite, RawUtils, SettingsTestContext} import com.typesafe.scalalogging.StrictLogging -import raw.inferrer.api.{AutoInferrerProperties, CsvInputFormatDescriptor, TextInputStreamFormatDescriptor} -import raw.sources.filesystem.local.LocalLocationsTestContext -import raw.utils.{RawTestSuite, RawUtils, SettingsTestContext} -import raw.sources.filesystem.local.LocalPath +import com.rawlabs.snapi.frontend.inferrer.api.{ + AutoInferrerProperties, + CsvInputFormatDescriptor, + TextInputStreamFormatDescriptor +} +import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext +import com.rawlabs.utils.sources.filesystem.local.LocalPath class RD3852 extends RawTestSuite with SettingsTestContext with StrictLogging with LocalLocationsTestContext { diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/TextTypeInferrerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala similarity index 98% rename from snapi-frontend/src/test/scala/raw/inferrer/local/TextTypeInferrerTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala index 98a33d869..ef7fd6dc1 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/TextTypeInferrerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.inferrer.local +package com.rawlabs.snapi.frontend.inferrer.local import com.typesafe.scalalogging.StrictLogging import org.scalatest.funsuite.AnyFunSuite -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.api._ class TextTypeInferrerTest extends AnyFunSuite with StrictLogging with TextTypeInferrer { diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/json/JsonOrTypeTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonOrTypeTest.scala similarity index 92% rename from snapi-frontend/src/test/scala/raw/inferrer/local/json/JsonOrTypeTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonOrTypeTest.scala index 59e78fdec..e0d55c12a 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/json/JsonOrTypeTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonOrTypeTest.scala @@ -10,13 +10,14 @@ * licenses/APL.txt. */ -package raw.inferrer.local.json +package com.rawlabs.snapi.frontend.inferrer.local.json +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext, TestData} import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper import org.scalatest.matchers.{MatchResult, Matcher} -import raw.inferrer.api._ -import raw.inferrer.local.LocalInferrerTestContext -import raw.utils._ +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.local.LocalInferrerTestContext +import com.rawlabs.utils.core._ import java.io.StringReader diff --git a/snapi-frontend/src/test/scala/raw/inferrer/local/xml/XmlTypeReaderTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlTypeReaderTest.scala similarity index 98% rename from snapi-frontend/src/test/scala/raw/inferrer/local/xml/XmlTypeReaderTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlTypeReaderTest.scala index c13907585..f247b342c 100644 --- a/snapi-frontend/src/test/scala/raw/inferrer/local/xml/XmlTypeReaderTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlTypeReaderTest.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.inferrer.local.xml +package com.rawlabs.snapi.frontend.inferrer.local.xml import org.scalatest.funsuite.AnyFunSuite -import raw.inferrer.api._ +import com.rawlabs.snapi.frontend.inferrer.api._ class XmlTypeReaderTest extends AnyFunSuite { diff --git a/snapi-frontend/src/test/scala/raw/compiler/rql2/Antlr4LSPTests.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LSPTests.scala similarity index 93% rename from snapi-frontend/src/test/scala/raw/compiler/rql2/Antlr4LSPTests.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LSPTests.scala index 0765dcc28..3c96b3fd9 100644 --- a/snapi-frontend/src/test/scala/raw/compiler/rql2/Antlr4LSPTests.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LSPTests.scala @@ -10,29 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 - -import raw.compiler.common.source.{ErrorType, IdnDef, IdnExp, IdnUse} -import raw.compiler.rql2.antlr4.Antlr4SyntaxAnalyzer -import raw.compiler.rql2.source.{ - BinaryExp, - FunApp, - FunAppArg, - FunBody, - FunParam, - FunProto, - IntConst, - Let, - LetBind, - LetFun, - Mult, - Rql2IntType, - Rql2IsNullableTypeProperty, - Rql2IsTryableTypeProperty, - Rql2Program, - TypeExp -} -import raw.utils.RawTestSuite +package com.rawlabs.snapi.frontend.rql2 + +import com.rawlabs.snapi.frontend.common.source.{ErrorType, IdnDef, IdnExp, IdnUse} +import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.utils.core.RawTestSuite class Antlr4LSPTests extends RawTestSuite { val triple = "\"\"\"" diff --git a/snapi-frontend/src/test/scala/raw/compiler/rql2/Antlr4TypeTests.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala similarity index 93% rename from snapi-frontend/src/test/scala/raw/compiler/rql2/Antlr4TypeTests.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala index f432302fc..97fccfae0 100644 --- a/snapi-frontend/src/test/scala/raw/compiler/rql2/Antlr4TypeTests.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala @@ -10,33 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.base.source.Type -import raw.compiler.rql2.antlr4.Antlr4SyntaxAnalyzer -import raw.compiler.rql2.source.{ - FunOptTypeParam, - FunType, - Rql2AttrType, - Rql2BoolType, - Rql2ByteType, - Rql2DecimalType, - Rql2DoubleType, - Rql2FloatType, - Rql2IntType, - Rql2IsNullableTypeProperty, - Rql2IsTryableTypeProperty, - Rql2IterableType, - Rql2ListType, - Rql2LongType, - Rql2OrType, - Rql2RecordType, - Rql2ShortType, - Rql2StringType, - Rql2TypeProperty, - Rql2UndefinedType -} -import raw.utils.RawTestSuite +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.utils.core.RawTestSuite class Antlr4TypeTests extends RawTestSuite { diff --git a/snapi-frontend/src/test/scala/raw/compiler/rql2/FrontendSyntaxAnalyzerCompareTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala similarity index 98% rename from snapi-frontend/src/test/scala/raw/compiler/rql2/FrontendSyntaxAnalyzerCompareTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala index d54d850ed..4adaeacfa 100644 --- a/snapi-frontend/src/test/scala/raw/compiler/rql2/FrontendSyntaxAnalyzerCompareTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.snapi.frontend.common.source.{Exp, SourceNode} +import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.rql2.source.TypeExp +import com.rawlabs.utils.core.RawTestSuite import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} -import raw.compiler.common.source.{Exp, SourceNode} -import raw.compiler.rql2.antlr4.Antlr4SyntaxAnalyzer -import raw.compiler.rql2.source.TypeExp -import raw.utils.RawTestSuite class FrontendSyntaxAnalyzerCompareTest extends RawTestSuite { val triple = "\"\"\"" diff --git a/snapi-frontend/src/test/scala/raw/compiler/rql2/OldFrontendSyntaxAnalyzerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala similarity index 94% rename from snapi-frontend/src/test/scala/raw/compiler/rql2/OldFrontendSyntaxAnalyzerTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala index 698160e2b..e05327359 100644 --- a/snapi-frontend/src/test/scala/raw/compiler/rql2/OldFrontendSyntaxAnalyzerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala @@ -10,37 +10,12 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 -import raw.compiler.base.source.{BaseProgram, Type} -import raw.compiler.common.source.{IdnDef, IdnExp, IdnUse} -import raw.compiler.rql2.source.{ - BinaryExp, - FunAbs, - FunApp, - FunAppArg, - FunBody, - FunOptTypeParam, - FunParam, - FunProto, - FunType, - Gt, - IntConst, - Let, - LetBind, - LetFun, - Rql2BoolType, - Rql2FloatType, - Rql2IntType, - Rql2IsNullableTypeProperty, - Rql2IsTryableTypeProperty, - Rql2ListType, - Rql2OrType, - Rql2Program, - Rql2StringType, - Rql2TypeProperty -} -import raw.utils.RawTestSuite +import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} +import com.rawlabs.snapi.frontend.common.source.{IdnDef, IdnExp, IdnUse} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.utils.core.RawTestSuite class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { diff --git a/snapi-frontend/src/test/scala/raw/compiler/rql2/PrettyPrintTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala similarity index 98% rename from snapi-frontend/src/test/scala/raw/compiler/rql2/PrettyPrintTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala index 023967d63..6bb98d1f4 100644 --- a/snapi-frontend/src/test/scala/raw/compiler/rql2/PrettyPrintTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.snapi.frontend.rql2.source.SourceCommentsPrettyPrinter +import com.rawlabs.utils.core.RawTestSuite import org.scalatest.Assertion -import raw.compiler.rql2.source.SourceCommentsPrettyPrinter -import raw.utils.RawTestSuite class PrettyPrintTest extends RawTestSuite { diff --git a/snapi-frontend/src/test/scala/raw/compiler/rql2/SyntaxAnalyzerCompareTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala similarity index 93% rename from snapi-frontend/src/test/scala/raw/compiler/rql2/SyntaxAnalyzerCompareTest.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala index 61a18d66e..fb6da27b0 100644 --- a/snapi-frontend/src/test/scala/raw/compiler/rql2/SyntaxAnalyzerCompareTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.rql2 +package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.snapi.frontend.common.source.{Exp, SourceNode} +import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.rql2.source.TypeExp +import com.rawlabs.utils.core.RawTestSuite import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} -import raw.compiler.common.source.{Exp, SourceNode} -import raw.compiler.rql2.antlr4.Antlr4SyntaxAnalyzer -import raw.compiler.rql2.source.TypeExp -import raw.utils.RawTestSuite class SyntaxAnalyzerCompareTest extends RawTestSuite { val triple = "\"\"\"" diff --git a/snapi-frontend/src/test/scala/raw/sources/filesystem/dropbox/DropboxTestContext.scala b/snapi-frontend/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxTestContext.scala similarity index 95% rename from snapi-frontend/src/test/scala/raw/sources/filesystem/dropbox/DropboxTestContext.scala rename to snapi-frontend/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxTestContext.scala index daa07b41f..cb25fc3b9 100644 --- a/snapi-frontend/src/test/scala/raw/sources/filesystem/dropbox/DropboxTestContext.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxTestContext.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox trait DropboxTestContext { diff --git a/snapi-frontend/src/test/scala/raw/sources/filesystem/local/LocalLocationsTestContext.scala b/snapi-frontend/src/test/scala/com/rawlabs/utils/sources/filesystem/local/LocalLocationsTestContext.scala similarity index 99% rename from snapi-frontend/src/test/scala/raw/sources/filesystem/local/LocalLocationsTestContext.scala rename to snapi-frontend/src/test/scala/com/rawlabs/utils/sources/filesystem/local/LocalLocationsTestContext.scala index ec9e86ec0..b0a5ba22c 100644 --- a/snapi-frontend/src/test/scala/raw/sources/filesystem/local/LocalLocationsTestContext.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/utils/sources/filesystem/local/LocalLocationsTestContext.scala @@ -10,9 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.local +package com.rawlabs.utils.sources.filesystem.local -import raw.utils._ +import com.rawlabs.utils.core.RawUtils +import com.rawlabs.utils.core._ import java.io.File import java.nio.file.Path diff --git a/snapi-parser/src/main/java/raw/readme.md b/snapi-parser/README.md similarity index 100% rename from snapi-parser/src/main/java/raw/readme.md rename to snapi-parser/README.md diff --git a/snapi-parser/src/main/java/raw/snapi/grammar/SnapiLexer.g4 b/snapi-parser/src/main/java/com/rawlabs/snapi/parser/grammar/SnapiLexer.g4 similarity index 100% rename from snapi-parser/src/main/java/raw/snapi/grammar/SnapiLexer.g4 rename to snapi-parser/src/main/java/com/rawlabs/snapi/parser/grammar/SnapiLexer.g4 diff --git a/snapi-parser/src/main/java/raw/snapi/grammar/SnapiParser.g4 b/snapi-parser/src/main/java/com/rawlabs/snapi/parser/grammar/SnapiParser.g4 similarity index 100% rename from snapi-parser/src/main/java/raw/snapi/grammar/SnapiParser.g4 rename to snapi-parser/src/main/java/com/rawlabs/snapi/parser/grammar/SnapiParser.g4 diff --git a/snapi-parser/src/main/java/module-info.java b/snapi-parser/src/main/java/module-info.java index 8ddbddddf..28c4ac46b 100644 --- a/snapi-parser/src/main/java/module-info.java +++ b/snapi-parser/src/main/java/module-info.java @@ -11,7 +11,7 @@ */ module raw.snapi.parser { - exports raw.compiler.rql2.generated; + exports com.rawlabs.snapi.parser.generated; requires org.antlr.antlr4.runtime; } diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleArg.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java similarity index 75% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleArg.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java index 1e2956141..7b0075a05 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleArg.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle; +package com.rawlabs.snapi.truffle.emitter; -import raw.compiler.base.source.Type; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public record TruffleArg(ExpressionNode exprNode, Type type, String identifier) {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleEmitter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleEmitter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java index bb9ce7a36..ac8dfda07 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleEmitter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle; +package com.rawlabs.snapi.truffle.emitter; import com.oracle.truffle.api.frame.FrameDescriptor; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.source.Rql2Method; -import raw.compiler.snapi.truffle.compiler.TruffleBuildBody; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.expressions.function.ClosureNode; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Method; +import com.rawlabs.snapi.truffle.emitter.compiler.TruffleBuildBody; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.function.ClosureNode; public abstract class TruffleEmitter { protected abstract void addScope(); diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleEntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java similarity index 81% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleEntryExtension.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java index a11ddb46b..77cdf4616 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleEntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle; +package com.rawlabs.snapi.truffle.emitter; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; import java.util.stream.Collectors; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; public interface TruffleEntryExtension { default ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleShortEntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java similarity index 85% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleShortEntryExtension.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java index a9072744e..3ca9e9d6a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/TruffleShortEntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle; +package com.rawlabs.snapi.truffle.emitter; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.util.List; import java.util.stream.Collectors; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.api.Rql2Arg; -import raw.runtime.truffle.ExpressionNode; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/CompilerScalaConsts.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java similarity index 75% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/CompilerScalaConsts.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java index 41d28d422..262b497c9 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/CompilerScalaConsts.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin; +package com.rawlabs.snapi.truffle.emitter.builtin; -import raw.compiler.rql2.source.Rql2IsNullableTypeProperty; -import raw.compiler.rql2.source.Rql2IsTryableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; public class CompilerScalaConsts { public static final Rql2IsTryableTypeProperty tryable = Rql2IsTryableTypeProperty.apply(); diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/WithArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java similarity index 85% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/WithArgs.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java index ac1025f01..e8ab5cf7e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/WithArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin; +package com.rawlabs.snapi.truffle.emitter.builtin; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.util.List; import java.util.Optional; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.runtime.truffle.ExpressionNode; public interface WithArgs { default Optional arg(List args, String kw) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java similarity index 81% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java index 0a39199f5..eff5ecbfd 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.aws_extension; - +package com.rawlabs.snapi.truffle.emitter.builtin.aws_extension; + +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.AwsV4SignedRequest; +import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.aws_package.AwsV4SignedRequestNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; import java.util.Optional; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.AwsV4SignedRequest; -import raw.compiler.rql2.source.Rql2AttrType; -import raw.compiler.rql2.source.Rql2ListType; -import raw.compiler.rql2.source.Rql2RecordType; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.binary.PlusNode; -import raw.runtime.truffle.ast.expressions.builtin.aws_package.AwsV4SignedRequestNodeGen; -import raw.runtime.truffle.ast.expressions.iterable.list.ListBuildNode; -import raw.runtime.truffle.ast.expressions.literals.StringNode; import scala.collection.immutable.HashSet; import scala.collection.immutable.Vector; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleBinaryBase64Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleBinaryBase64Entry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java index 6a1852532..1a8797389 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleBinaryBase64Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.binary_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.BinaryBase64Entry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package.BinaryBase64NodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.BinaryBase64Entry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.binary_package.BinaryBase64NodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleBinaryReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleBinaryReadEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java index bfe230b9c..78cb4d78f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleBinaryReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.binary_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.BinaryReadEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package.BinaryReadNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.BinaryReadEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.binary_package.BinaryReadNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleFromStringBinaryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleFromStringBinaryEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java index ccba796f3..15f586671 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/binary_extension/TruffleFromStringBinaryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.binary_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.FromStringBinaryEntryExtension; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package.BinaryFromStringNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.FromStringBinaryEntryExtension; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.binary_package.BinaryFromStringNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/byte_extension/TruffleByteFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/byte_extension/TruffleByteFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java index 0b2558d75..e471905ec 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/byte_extension/TruffleByteFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.byte_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.byte_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ByteFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.byte_package.ByteFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ByteFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.byte_package.ByteFromNodeGen; public class TruffleByteFromEntry extends ByteFromEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleBuildCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleBuildCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java index 767072bc3..ff09cbb79 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleBuildCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.BuildCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionBuildNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.BuildCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionBuildNode; public class TruffleBuildCollectionEntry extends BuildCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleCountCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleCountCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java index 394a1640b..6b9b22648 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleCountCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.CountCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.CountCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; public class TruffleCountCollectionEntry extends CountCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleDistinctCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleDistinctCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java index 72294bb75..e892d20d2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleDistinctCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.DistinctCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionDistinctNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.DistinctCollectionEntry; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionDistinctNodeGen; public class TruffleDistinctCollectionEntry extends DistinctCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleEmptyCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleEmptyCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java index aeec8341b..2b32688cb 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleEmptyCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.EmptyCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionBuildNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.EmptyCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionBuildNode; public class TruffleEmptyCollectionEntry extends EmptyCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleExistsCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java similarity index 72% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleExistsCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java index 5cf9c6658..2fd055e48 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleExistsCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.ExistsCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionExistsNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.ExistsCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionExistsNode; public class TruffleExistsCollectionEntry extends ExistsCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFilterCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java similarity index 71% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFilterCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java index f11d26c0c..5129f119e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFilterCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.FilterCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFilterNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.FilterCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionFilterNode; public class TruffleFilterCollectionEntry extends FilterCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFirstCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFirstCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java index e9fd57f4a..6fdceff8c 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFirstCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.FirstCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFirstNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.FirstCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionFirstNodeGen; public class TruffleFirstCollectionEntry extends FirstCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFromCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFromCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java index d5fc28cdb..501f24a3e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleFromCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.FromCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.FromCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; public class TruffleFromCollectionEntry extends FromCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleGroupCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java similarity index 80% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleGroupCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java index b03cdc633..2a7358823 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleGroupCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.GroupCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionGroupByNodeGen; import java.util.Arrays; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.GroupCollectionEntry; -import raw.compiler.rql2.source.*; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionGroupByNodeGen; import scala.collection.JavaConverters; import scala.collection.immutable.HashSet; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java similarity index 75% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java index d971de3f2..a0b6bfa32 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.InternalEquiJoinCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.source.FunType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionEquiJoinNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.InternalEquiJoinCollectionEntry; -import raw.compiler.rql2.source.FunType; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionEquiJoinNode; public class TruffleInternalEquiJoinCollectionEntry extends InternalEquiJoinCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java similarity index 75% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java index feb672ff1..1d62f91a6 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.InternalJoinCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.source.FunType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionJoinNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.InternalJoinCollectionEntry; -import raw.compiler.rql2.source.FunType; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionJoinNodeGen; public class TruffleInternalJoinCollectionEntry extends InternalJoinCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleLastCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleLastCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java index ec7a6130f..80a27be74 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleLastCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.LastCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.LastCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; public class TruffleLastCollectionEntry extends LastCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMaxCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMaxCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java index 73e4a9831..44b629b2a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMaxCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.MaxCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.MaxCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; public class TruffleMaxCollectionEntry extends MaxCollectionEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMinCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java index 89376aab7..1d66ca264 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.MinCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.MinCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; public class TruffleMinCollectionEntry extends MinCollectionEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMkStringCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java similarity index 76% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMkStringCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java index b3a851189..fd003e321 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleMkStringCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.MkStringCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionMkStringNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.MkStringCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionMkStringNode; -import raw.runtime.truffle.ast.expressions.literals.StringNode; public class TruffleMkStringCollectionEntry extends MkStringCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleOrderByCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleOrderByCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java index a2014d271..cafbddff6 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleOrderByCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.OrderByCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.source.FunType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionOrderByNode; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.OrderByCollectionEntry; -import raw.compiler.rql2.source.FunType; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionOrderByNode; public class TruffleOrderByCollectionEntry extends OrderByCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleSumCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleSumCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java index 84c3e3374..3a9aaa4bd 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleSumCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.SumCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.SumCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; public class TruffleSumCollectionEntry extends SumCollectionEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTakeCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTakeCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java index 979482f98..8ed29344d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTakeCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TakeCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTakeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TakeCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionTakeNodeGen; public class TruffleTakeCollectionEntry extends TakeCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTransformCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTransformCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java index 3baa93ffd..41527ae67 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTransformCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TransformCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTransformNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TransformCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionTransformNodeGen; public class TruffleTransformCollectionEntry extends TransformCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java similarity index 67% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java index 5b59fcaa5..e704d3dbe 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.TupleAvgCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTupleAvgNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.TupleAvgCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionTupleAvgNode; public class TruffleTupleAvgCollectionEntry extends TupleAvgCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleUnionCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleUnionCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java index 09c256069..dc7e89082 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleUnionCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.UnionCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionUnionNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.UnionCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionUnionNode; public class TruffleUnionCollectionEntry extends UnionCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleUnnestCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleUnnestCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java index 3452f02df..3716ebd5c 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleUnnestCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.UnnestCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionUnnestNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.UnnestCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionUnnestNodeGen; public class TruffleUnnestCollectionEntry extends UnnestCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleZipCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleZipCollectionEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java index 856137561..b5539c479 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/collection_extension/TruffleZipCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.collection_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ZipCollectionEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionZipNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ZipCollectionEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionZipNodeGen; public class TruffleZipCollectionEntry extends ZipCollectionEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/CsvParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java similarity index 86% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/CsvParser.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java index 795806e05..5dd61834a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/CsvParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java @@ -10,25 +10,25 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.csv_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; import com.oracle.truffle.api.frame.FrameDescriptor; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.source.*; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListBuildNode; -import raw.runtime.truffle.ast.expressions.literals.IntNode; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.expressions.option.OptionSomeNodeGen; -import raw.runtime.truffle.ast.io.csv.reader.parser.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionSomeNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import scala.collection.JavaConverters; import scala.collection.immutable.HashSet; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.nullable; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.tryable; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.nullable; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.tryable; import java.util.List; import java.util.Optional; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/TruffleCsvParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/TruffleCsvParseEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java index 80760e29e..9f5e788e3 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/TruffleCsvParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.csv_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.CsvParseEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.CsvParseEntry; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; public class TruffleCsvParseEntry extends CsvParseEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/TruffleCsvReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/TruffleCsvReadEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java index 7fa2fa9eb..1e55662b0 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/csv_extension/TruffleCsvReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.csv_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.CsvReadEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.CsvReadEntry; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; public class TruffleCsvReadEntry extends CsvReadEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateAddIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java index fab0f0e1c..0eff8161a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateAddIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateAddIntervalNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateAddIntervalEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateAddIntervalNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java index aa673d917..81d76a284 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateBuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateBuildNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateBuildEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateBuildNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateDayEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java index 4d0db4de6..8dea4a61a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateDayEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateDayNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateDayEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateDayNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateFromEpochDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateFromEpochDayEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java index e26a2bef9..010fed76f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateFromEpochDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateFromEpochDayEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateFromEpochDayNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateFromEpochDayEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateFromEpochDayNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateFromTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateFromTimestampEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java index ea89e320c..46559fa4d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateFromTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateFromTimestampEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateFromTimestampNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateFromTimestampEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateFromTimestampNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateMonthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateMonthEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java index 91e8763b6..d0d3690bc 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateMonthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateMonthEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateMonthNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateMonthEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateMonthNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateNowEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java index 232278b92..8edcc414b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateNowEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateNowNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateNowEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateNowNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateParseEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java index c7366966c..f2d9eeba2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateParseEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateParseNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateParseEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateParseNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateSubtractEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java index 8ac5d8617..f5c65ea6a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateSubtractNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateSubtractEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateSubtractNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateSubtractIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java index 8520d6f85..53d4fc65a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateSubtractIntervalNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateSubtractIntervalEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateSubtractIntervalNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateYearEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateYearEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java index 816094a92..568029f17 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/date_extension/TruffleDateYearEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.date_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DateYearEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateYearNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DateYearEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.date_package.DateYearNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/decimal_extension/TruffleDecimalFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/decimal_extension/TruffleDecimalFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java index 702433bda..71f877ed8 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/decimal_extension/TruffleDecimalFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.decimal_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.DecimalFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package.DecimalFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.DecimalFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.decimal_package.DecimalFromNodeGen; public class TruffleDecimalFromEntry extends DecimalFromEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/decimal_extension/TruffleDecimalRoundEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/decimal_extension/TruffleDecimalRoundEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java index 5f8192385..b848805c2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/decimal_extension/TruffleDecimalRoundEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.decimal_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.DecimalRoundEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package.DecimalRoundNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.DecimalRoundEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.numeric.decimal_package.DecimalRoundNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/double_extension/TruffleDoubleFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/double_extension/TruffleDoubleFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java index daf95484e..12730a450 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/double_extension/TruffleDoubleFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.double_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.double_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.DoubleFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.double_package.DoubleFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.DoubleFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.double_package.DoubleFromNodeGen; public class TruffleDoubleFromEntry extends DoubleFromEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentParameterEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentParameterEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java index d5654888e..2fb53a8da 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentParameterEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.environment_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentParameterEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package.EnvironmentParameterNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.EnvironmentParameterEntry; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.environment_package.EnvironmentParameterNodeGen; import scala.collection.immutable.HashSet; public class TruffleEnvironmentParameterEntry extends EnvironmentParameterEntry diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentScopesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentScopesEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java index ee48d3eac..3c46627d1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentScopesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.environment_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentScopesEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package.EnvironmentScopesNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.EnvironmentScopesEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.environment_package.EnvironmentScopesNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentSecretEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentSecretEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java index a17d80590..7f01fb93f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/environment_extension/TruffleEnvironmentSecretEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.environment_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentSecretEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package.EnvironmentSecretNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.EnvironmentSecretEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.environment_package.EnvironmentSecretNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java index cfc67c986..b0bf9da79 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.error_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableFailureNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ErrorBuildEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableFailureNodeGen; public class TruffleErrorBuildEntry extends ErrorBuildEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java index 925fcbb04..2ac977d76 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.error_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildWithTypeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableFailureWithTypeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ErrorBuildWithTypeEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableFailureWithTypeNodeGen; public class TruffleErrorBuildWithTypeEntry extends ErrorBuildWithTypeEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorGetEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java index ebd84cb96..05af2a843 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/error_extension/TruffleErrorGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.error_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ErrorGetEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableGetFailureNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ErrorGetEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableGetFailureNodeGen; public class TruffleErrorGetEntry extends ErrorGetEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/float_extension/TruffleFloatFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/float_extension/TruffleFloatFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java index 57c9cd8bc..29c2a10d2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/float_extension/TruffleFloatFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.float_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.float_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.FloatFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.FloatFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; public class TruffleFloatFromEntry extends FloatFromEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java index a8b1a009f..0f763325d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.function_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.function_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.FunctionInvokeAfterEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.function_package.FunctionInvokeAfterNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.FunctionInvokeAfterEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.function_package.FunctionInvokeAfterNodeGen; public class TruffleFunctionInvokeAfterEntry extends FunctionInvokeAfterEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpCallEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java similarity index 73% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpCallEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java index b640b7c49..2ee3f3478 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpCallEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; - +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; + +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.HttpCallEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromHttpNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.HttpCallEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromHttpNode; public abstract class TruffleHttpCallEntry extends HttpCallEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpDeleteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpDeleteEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpDeleteEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpDeleteEntry.java index 7e9a74fd6..ca1f13beb 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpDeleteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpDeleteEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpDeleteEntry extends TruffleHttpCallEntry { public TruffleHttpDeleteEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpGetEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpGetEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpGetEntry.java index a65bddb6b..45a956e1f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpGetEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpGetEntry extends TruffleHttpCallEntry { public TruffleHttpGetEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpHeadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpHeadEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpHeadEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpHeadEntry.java index ca4cee734..7c3e554a2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpHeadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpHeadEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpHeadEntry extends TruffleHttpCallEntry { public TruffleHttpHeadEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpOptionsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpOptionsEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpOptionsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpOptionsEntry.java index 8439e1c57..0df2510a4 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpOptionsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpOptionsEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpOptionsEntry extends TruffleHttpCallEntry { public TruffleHttpOptionsEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPatchEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPatchEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPatchEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPatchEntry.java index 4183774db..e3ea4c258 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPatchEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPatchEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpPatchEntry extends TruffleHttpCallEntry { public TruffleHttpPatchEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPostEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPostEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPostEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPostEntry.java index 2824a5285..673012528 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPostEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPostEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpPostEntry extends TruffleHttpCallEntry { public TruffleHttpPostEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPutEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPutEntry.java similarity index 88% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPutEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPutEntry.java index aea786099..1c96a9fbc 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpPutEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpPutEntry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; public class TruffleHttpPutEntry extends TruffleHttpCallEntry { public TruffleHttpPutEntry() { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpReadEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java index 84cd5a7d0..95a40bbaf 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.HttpReadEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package.HttpReadNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.HttpReadEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.http_package.HttpReadNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpUrlDecode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpUrlDecode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java index 6d8d5e8bb..ef9504ead 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpUrlDecode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlDecodeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package.HttpUrlDecodeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.HttpUrlDecodeEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.http_package.HttpUrlDecodeNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpUrlEncode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpUrlEncode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java index 0050717d0..c5bc25e33 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/http_extension/TruffleHttpUrlEncode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.http_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlEncodeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package.HttpUrlEncodeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.HttpUrlEncodeEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.http_package.HttpUrlEncodeNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/int_extension/TruffleIntFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/int_extension/TruffleIntFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java index 513f10648..d117048d9 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/int_extension/TruffleIntFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.int_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.int_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.IntFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package.IntFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.IntFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.int_package.IntFromNodeGen; public class TruffleIntFromEntry extends IntFromEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/int_extension/TruffleIntRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java similarity index 62% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/int_extension/TruffleIntRangeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java index 6423283c1..71f670cf4 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/int_extension/TruffleIntRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.int_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.int_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.IntRangeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package.IntRangeNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.IntRangeEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.int_package.IntRangeNodeGen; -import raw.runtime.truffle.ast.expressions.literals.IntNode; public class TruffleIntRangeEntry extends IntRangeEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleBuildIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java similarity index 80% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleBuildIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java index 116d84f95..367cf5bd9 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleBuildIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.BuildIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.BuildIntervalEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; -import raw.runtime.truffle.ast.expressions.literals.IntNode; public class TruffleBuildIntervalEntry extends BuildIntervalEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalDaysEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalDaysEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java index cc2aa78f1..ddad60ab2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalDaysEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalDaysEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalDaysNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalDaysEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalDaysNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalFromMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalFromMillisEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java index e7a0c4646..37b57c065 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalFromMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalFromMillisEntryExtension; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalFromMillisNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalFromMillisEntryExtension; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalFromMillisNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalHoursEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalHoursEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java index 6f631674b..32141ee34 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalHoursEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalHoursEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalHoursNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalHoursEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalHoursNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMillisEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java index 120f1bcab..28f64472b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalMillisEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalMillisNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalMillisEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMillisNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMinutesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMinutesEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java index bb0efff54..d3ed497ae 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMinutesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalMinutesEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalMinutesNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalMinutesEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMinutesNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMonthsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMonthsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java index c98a7fd2a..1355a6268 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalMonthsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalMonthsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalMonthsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalMonthsEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMonthsNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalParseEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java index 05e96a9f9..8b08c74b9 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalParseEntryExtension; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalParseNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalParseEntryExtension; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalParseNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalSecondsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalSecondsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java index c9d784bf4..4f6673bad 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalSecondsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalSecondsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalSecondsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalSecondsEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalSecondsNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalToMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalToMillisEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java index 74a285f82..9ea117709 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalToMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalToMillisEntryExtension; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalToMillisNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalToMillisEntryExtension; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalToMillisNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalWeeksEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalWeeksEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java index cbb54e8dc..c579d3aee 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalWeeksEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalWeeksEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalWeeksNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalWeeksEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalWeeksNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalYearsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalYearsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java index 0191ba157..dc5fbb48d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/interval_extension/TruffleIntervalYearsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.interval_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalYearsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalYearsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.IntervalYearsEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalYearsNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/jdbc/Jdbc.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java similarity index 80% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/jdbc/Jdbc.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java index 4a4222ba3..1aa9da0bf 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/jdbc/Jdbc.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.jdbc; +package com.rawlabs.snapi.truffle.emitter.builtin.jdbc; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.*; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; import com.oracle.truffle.api.frame.FrameDescriptor; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.jdbc.JdbcQueryNode; -import raw.runtime.truffle.ast.io.csv.writer.internal.*; -import raw.runtime.truffle.ast.io.jdbc.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.jdbc.JdbcQueryNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal.*; +import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; import scala.collection.JavaConverters; public class Jdbc { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/JsonParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java similarity index 79% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/JsonParser.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java index 20fc4dd83..b6d062bc1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/JsonParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java @@ -10,36 +10,36 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.json_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.parser.*; -import raw.runtime.truffle.ast.io.json.reader.parser.BinaryParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.BooleanParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.ByteParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.DateParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.DecimalParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.DoubleParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.FloatParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.IntParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.IntervalParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.LongParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.ShortParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.StringParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.TimeParseJsonNodeGen; -import raw.runtime.truffle.ast.io.json.reader.parser.TimestampParseJsonNodeGen; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.*; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.BinaryParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.BooleanParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.ByteParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.DateParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.DecimalParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.DoubleParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.FloatParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.IntParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.IntervalParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.LongParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.ShortParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.StringParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.TimeParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.TimestampParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import scala.collection.JavaConverters; import java.util.LinkedHashMap; import java.util.List; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.*; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; public class JsonParser { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TruffleParseJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java similarity index 60% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TruffleParseJsonEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java index 07305acc8..de7cb70a9 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TruffleParseJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.json_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.tryable; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.tryable; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ParseJsonEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParseNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParseNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ParseJsonEntry; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.io.json.reader.JsonParseNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParseNodeGen; -import raw.runtime.truffle.ast.io.json.reader.TryableTopLevelWrapper; public class TruffleParseJsonEntry extends ParseJsonEntry implements TruffleEntryExtension, WithJsonArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TrufflePrintJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TrufflePrintJsonEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java index 26752e919..a32b73300 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TrufflePrintJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.json_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.PrintJsonEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.output.JsonWriter; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonPrintNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.PrintJsonEntry; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.rql2output.truffle.builtin.JsonWriter; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.io.json.reader.JsonPrintNodeGen; public class TrufflePrintJsonEntry extends PrintJsonEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TruffleReadJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TruffleReadJsonEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java index 0274b4d12..3ca94fdfd 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/TruffleReadJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.json_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ReadJsonEntry; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.io.json.reader.JsonReadCollectionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonReadValueNode; -import raw.runtime.truffle.ast.io.json.reader.TryableTopLevelWrapper; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ReadJsonEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonReadCollectionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonReadValueNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.*; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; public class TruffleReadJsonEntry extends ReadJsonEntry implements TruffleEntryExtension, WithJsonArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/WithJsonArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java similarity index 76% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/WithJsonArgs.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java index 4fbfe19e2..735117208 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/json_extension/WithJsonArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.json_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.literals.StringNode; public interface WithJsonArgs extends WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/kryo_extension/TruffleKryoDecodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java similarity index 55% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/kryo_extension/TruffleKryoDecodeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java index cc8f74350..0403c43eb 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/kryo_extension/TruffleKryoDecodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.kryo_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.KryoDecodeEntry; +import com.rawlabs.snapi.frontend.rql2.source.ExpType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.io.kryo.KryoFromNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.KryoDecodeEntry; -import raw.compiler.rql2.source.ExpType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.io.kryo.KryoFromNode; public class TruffleKryoDecodeEntry extends KryoDecodeEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/kryo_extension/TruffleKryoEncodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/kryo_extension/TruffleKryoEncodeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java index 09c0175b5..fd4f1aa8b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/kryo_extension/TruffleKryoEncodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.kryo_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.KryoEncodeEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.io.kryo.KryoWriteNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.KryoEncodeEntry; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.io.kryo.KryoWriteNode; public class TruffleKryoEncodeEntry extends KryoEncodeEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleBuildListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java similarity index 59% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleBuildListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java index 6221501df..651cc8ff8 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleBuildListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.BuildListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.BuildListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListBuildNode; public class TruffleBuildListEntry extends BuildListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleCountListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleCountListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java index f831cc8a0..04c84a460 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleCountListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.CountListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListCountNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.CountListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListCountNodeGen; public class TruffleCountListEntry extends CountListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleEmptyListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleEmptyListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java index 5f61737c1..70acb1821 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleEmptyListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.EmptyListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.EmptyListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListBuildNode; public class TruffleEmptyListEntry extends EmptyListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleExistsListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java similarity index 72% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleExistsListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java index ad8edf460..1660e29b8 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleExistsListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.ExistsListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListExistsNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.ExistsListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListExistsNode; public class TruffleExistsListEntry extends ExistsListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFilterListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java similarity index 74% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFilterListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java index 93be6ea02..4c517e4ec 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFilterListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.FilterListEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFilterNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.FilterListEntry; -import raw.compiler.rql2.source.Rql2ListType; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFilterNode; public class TruffleFilterListEntry extends FilterListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFirstListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFirstListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java index 95e1f1df3..b9668dd9f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFirstListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.FirstListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFirstNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.FirstListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFirstNodeGen; public class TruffleFirstListEntry extends FirstListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFromListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java similarity index 72% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFromListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java index 7a66853b2..3364a386f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleFromListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.FromListEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.FromListEntry; -import raw.compiler.rql2.source.Rql2ListType; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFromNode; public class TruffleFromListEntry extends FromListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleGetListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleGetListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java index f838c7eaf..ed0eb7873 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleGetListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.GetListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListGetNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.GetListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListGetNodeGen; public class TruffleGetListEntry extends GetListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleGroupListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java similarity index 80% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleGroupListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java index 62080aab0..a167844f1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleGroupListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.GroupListEntry; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListGroupByNode; import java.util.Arrays; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.GroupListEntry; -import raw.compiler.rql2.source.*; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListGroupByNode; import scala.collection.JavaConverters; import scala.collection.immutable.HashSet; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleLastListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleLastListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java index b9d3f309a..4ad5cac8f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleLastListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LastListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListLastNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LastListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListLastNodeGen; public class TruffleLastListEntry extends LastListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleMaxListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleMaxListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java index 59492358c..ce42a174a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleMaxListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.MaxListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.MaxListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; public class TruffleMaxListEntry extends MaxListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleMinListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleMinListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java index 856b5bea7..70a78fb05 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleMinListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.MinListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.MinListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; public class TruffleMinListEntry extends MinListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleSumListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleSumListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java index a6363b0ca..3d790c864 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleSumListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.SumListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.SumListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregateSingleNode; -import raw.runtime.truffle.ast.expressions.aggregation.Aggregations; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; public class TruffleSumListEntry extends SumListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleTakeListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleTakeListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java index 118c72af3..b1c7a1632 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleTakeListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TakeListEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListTakeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TakeListEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.iterable.list.ListTakeNodeGen; public class TruffleTakeListEntry extends TakeListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleTransformListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java similarity index 73% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleTransformListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java index d25eac83a..d67d1871d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleTransformListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.TransformListEntry; +import com.rawlabs.snapi.frontend.rql2.source.FunType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListTransformNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.TransformListEntry; -import raw.compiler.rql2.source.FunType; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListTransformNode; public class TruffleTransformListEntry extends TransformListEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleUnsafeFromListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java similarity index 72% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleUnsafeFromListEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java index 912b329a3..82078f9c9 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/list_extension/TruffleUnsafeFromListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.list_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.UnsafeFromListEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromUnsafe; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.UnsafeFromListEntry; -import raw.compiler.rql2.source.Rql2ListType; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFromUnsafe; public class TruffleUnsafeFromListEntry extends UnsafeFromListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationDescribeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java similarity index 61% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationDescribeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java index 8f71fde90..64dbef8a2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationDescribeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.location_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LocationDescribeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationDescribeNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LocationDescribeEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationDescribeNodeGen; -import raw.runtime.truffle.ast.expressions.literals.IntNode; public class TruffleLocationDescribeEntry extends LocationDescribeEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationFromStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java similarity index 55% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationFromStringEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java index 57ebd9d16..98e3e005f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationFromStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.location_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LocationFromStringEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromStringNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LocationFromStringEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromStringNode; public class TruffleLocationFromStringEntry extends LocationFromStringEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationLlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationLlEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java index b78f0d789..526b04893 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationLlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.location_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LocationLlEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationLlNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LocationLlEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationLlNodeGen; public class TruffleLocationLlEntry extends LocationLlEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationLsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationLsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java index 2a8f99cbb..3536ad221 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/location_extension/TruffleLocationLsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.location_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LocationLsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationLsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LocationLsEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationLsNodeGen; public class TruffleLocationLsEntry extends LocationLsEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/long_extension/TruffleLongFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/long_extension/TruffleLongFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java index 02ec17dbc..15ebf0164 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/long_extension/TruffleLongFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.long_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.long_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LongFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package.LongFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LongFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.long_package.LongFromNodeGen; public class TruffleLongFromEntry extends LongFromEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/long_extension/TruffleLongRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java similarity index 62% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/long_extension/TruffleLongRangeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java index f9258a851..6050d4f58 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/long_extension/TruffleLongRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.long_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.long_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.LongRangeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package.LongRangeNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.LongNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.LongRangeEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.long_package.LongRangeNodeGen; -import raw.runtime.truffle.ast.expressions.literals.LongNode; public class TruffleLongRangeEntry extends LongRangeEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAbsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAbsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java index 2e7ddc76d..bdf9e69d4 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAbsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.MathAbsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAbsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.MathAbsEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathAbsNodeGen; public class TruffleMathAbsEntry extends MathAbsEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAcosEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAcosEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java index 84cd720bb..2608da2a5 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAcosEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathAcosEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAcosNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathAcosEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathAcosNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAsinEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAsinEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java index 363d35e10..58507ea20 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAsinEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathAsinEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAsinNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathAsinEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathAsinNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAtanEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAtanEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java index d0caa87ef..8e36bbc97 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAtanEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathAtanEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAtanNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathAtanEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathAtanNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAtn2Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAtn2Entry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java index daf4f6b30..e4b6f9db0 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathAtn2Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathAtn2Entry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAtn2NodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathAtn2Entry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathAtn2NodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCeilingEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCeilingEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java index bed3a6483..b30651b4a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCeilingEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathCeilingEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathCeilingNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathCeilingEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathCeilingNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCosEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCosEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java index 5954d0cb6..c0114e96f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCosEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathCosEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathCosNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathCosEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathCosNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCotEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCotEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java index e0256b28f..3f3f63193 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathCotEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathCotEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathCotNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathCotEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathCotNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathDegreesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathDegreesEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java index 6fc8d2827..d114a7a58 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathDegreesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathDegreesEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathDegreesNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathDegreesEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathDegreesNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathExpEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathExpEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java index 4c4e6711d..c528c13d2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathExpEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathExpEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathExpNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathExpEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathExpNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathFloorEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathFloorEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java index a2dd59e20..60d98e664 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathFloorEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathFloorEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathFloorNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathFloorEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathFloorNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathLog10Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathLog10Entry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java index 433b0c259..f77c20cbd 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathLog10Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathLog10Entry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathLog10NodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathLog10Entry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathLog10NodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathLogEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathLogEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java index c949f22ee..cdf5ec51a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathLogEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathLogEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathLogNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathLogEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathLogNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathPiEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathPiEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java index e908ddb20..1f08d6f8e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathPiEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathPiEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.DoubleNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathPiEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.literals.DoubleNode; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathPowerEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathPowerEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java index a21a70350..05ec988c1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathPowerEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathPowerEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathPowerNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathPowerEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathPowerNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathRadiansEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathRadiansEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java index acf67a499..4f647b0ea 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathRadiansEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathRadiansEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathRadiansNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathRadiansEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathRadiansNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathRandomEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathRandomEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java index b697579ae..b2c68bf05 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathRandomEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathRandomEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.DoubleNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathRandomEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.literals.DoubleNode; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSignEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSignEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java index 15e9a034e..9b026aa60 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSignEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathSignEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSignNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathSignEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathSignNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSinEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSinEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java index 4150b50ec..b9ff0765f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSinEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathSinEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSinNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathSinEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathSinNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSqrtEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSqrtEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java index da6887fa5..b744f8a7d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSqrtEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathSqrtEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSqrtNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathSqrtEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathSqrtNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSquareEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSquareEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java index 94ec1d092..e6fc18aff 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathSquareEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathSquareEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSquareNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathSquareEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathSquareNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathTanEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathTanEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java index b77e6806e..0fe687132 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/math_extension/TruffleMathTanEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.math_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.MathTanEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathTanNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.MathTanEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.math_package.MathTanNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/mysql_extension/TruffleMySQLQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/mysql_extension/TruffleMySQLQueryEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java index 70574a0cb..59d00cd12 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/mysql_extension/TruffleMySQLQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.mysql_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.MySQLQueryEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromMySQLCredentialNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromMySQLNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.MySQLExceptionHandler; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.MySQLQueryEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.compiler.snapi.truffle.builtin.jdbc.Jdbc; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromMySQLCredentialNode; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromMySQLNode; -import raw.runtime.truffle.ast.expressions.literals.IntNode; -import raw.runtime.truffle.runtime.exceptions.rdbms.MySQLExceptionHandler; public class TruffleMySQLQueryEntry extends MySQLQueryEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java index b03511976..8cedbfc1a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.nullable_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.NullableBuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionSomeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.NullableBuildEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.option.OptionSomeNodeGen; public class TruffleNullableBuildEntry extends NullableBuildEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableEmptyEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java index 0693deb28..b1b7c7d59 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.nullable_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.NullableEmptyEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionNoneNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.NullableEmptyEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.option.OptionNoneNode; public class TruffleNullableEmptyEntry extends NullableEmptyEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableIsNullEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java similarity index 54% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableIsNullEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java index bbf97b681..d71ca1801 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableIsNullEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.nullable_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.NullableIsNullEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionIsDefinedNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.unary.NotNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.NullableIsNullEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.option.OptionIsDefinedNodeGen; -import raw.runtime.truffle.ast.expressions.unary.NotNodeGen; public class TruffleNullableIsNullEntry extends NullableIsNullEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableTransformEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableTransformEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java index c3e7e02a9..83a689ef8 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableTransformEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.nullable_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.NullableTransformEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionMapNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.NullableTransformEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.option.OptionMapNodeGen; public class TruffleNullableTransformEntry extends NullableTransformEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java index fe3aa17a3..7f9726a7b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.nullable_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.NullableUnsafeGetEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionUnsafeGetNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.NullableUnsafeGetEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.option.OptionUnsafeGetNodeGen; public class TruffleNullableUnsafeGetEntry extends NullableUnsafeGetEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java similarity index 66% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java index 06a0fd3e5..937f2c50d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.nullable_tryable_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.nullable_tryable_extension; -import static raw.compiler.snapi.truffle.builtin.CompilerScalaConsts.*; +import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.FlatMapNullableTryableEntry; +import com.rawlabs.snapi.frontend.rql2.source.FunType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionFlatMapNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionGetOrElseNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionMapNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionNoneNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableFlatMapNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableNullableFlatMapNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableSuccessNodeGen; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.FlatMapNullableTryableEntry; -import raw.compiler.rql2.source.FunType; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.option.OptionFlatMapNodeGen; -import raw.runtime.truffle.ast.expressions.option.OptionGetOrElseNodeGen; -import raw.runtime.truffle.ast.expressions.option.OptionMapNodeGen; -import raw.runtime.truffle.ast.expressions.option.OptionNoneNode; -import raw.runtime.truffle.ast.expressions.tryable.TryableFlatMapNodeGen; -import raw.runtime.truffle.ast.expressions.tryable.TryableNullableFlatMapNodeGen; -import raw.runtime.truffle.ast.expressions.tryable.TryableSuccessNodeGen; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; public class TruffleFlatMapNullableTryableEntry extends FlatMapNullableTryableEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/oracle_extension/TruffleOracleQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/oracle_extension/TruffleOracleQueryEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java index 78ac05277..58d81bf36 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/oracle_extension/TruffleOracleQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.oracle_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.OracleQueryEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromOracleCredentialNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromOracleNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.OracleExceptionHandler; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.OracleQueryEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.compiler.snapi.truffle.builtin.jdbc.Jdbc; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromOracleCredentialNode; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromOracleNode; -import raw.runtime.truffle.ast.expressions.literals.IntNode; -import raw.runtime.truffle.runtime.exceptions.rdbms.OracleExceptionHandler; public class TruffleOracleQueryEntry extends OracleQueryEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java index 344cd843a..b5b76ba14 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.postgresql_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLQueryEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromPostgreSQLCredentialNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromPostgreSQLNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.PostgreSQLExceptionHandler; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.PostgreSQLQueryEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.compiler.snapi.truffle.builtin.jdbc.Jdbc; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromPostgreSQLCredentialNode; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromPostgreSQLNode; -import raw.runtime.truffle.ast.expressions.literals.IntNode; -import raw.runtime.truffle.runtime.exceptions.rdbms.PostgreSQLExceptionHandler; public class TrufflePostgreSQLQueryEntry extends PostgreSQLQueryEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordAddFieldEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordAddFieldEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java index f53e0d429..407a85de4 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordAddFieldEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.record_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordAddFieldEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordAddFieldNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RecordAddFieldEntry; -import raw.compiler.rql2.source.Rql2RecordType; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.expressions.record.RecordAddFieldNodeGen; public class TruffleRecordAddFieldEntry extends RecordAddFieldEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java index d28c56689..49af5d74f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.record_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordBuildEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordBuildNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RecordBuildEntry; -import raw.compiler.rql2.source.Rql2AttrType; -import raw.compiler.rql2.source.Rql2RecordType; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.record.RecordBuildNode; import scala.collection.JavaConverters; public class TruffleRecordBuildEntry extends RecordBuildEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordConcatEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordConcatEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java index eaedecba1..435b70ca3 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordConcatEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.record_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordConcatEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordConcatNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RecordConcatEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.record.RecordConcatNodeGen; public class TruffleRecordConcatEntry extends RecordConcatEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordFieldsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordFieldsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java index 52f010cc3..43f038e4b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordFieldsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.record_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordFieldsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordFieldsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RecordFieldsEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.record.RecordFieldsNodeGen; public class TruffleRecordFieldsEntry extends RecordFieldsEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java index 610efae55..fc7108f22 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.record_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordGetFieldByIndexEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordProjNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RecordGetFieldByIndexEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.record.RecordProjNodeGen; public class TruffleRecordGetFieldByIndexEntry extends RecordGetFieldByIndexEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordRemoveFieldEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java similarity index 68% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordRemoveFieldEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java index 04d359833..89fdd9d18 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/record_extension/TruffleRecordRemoveFieldEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.record_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordRemoveFieldEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordRemoveFieldNodeGen; import java.util.Arrays; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RecordRemoveFieldEntry; -import raw.compiler.rql2.source.Rql2AttrType; -import raw.compiler.rql2.source.Rql2RecordType; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.expressions.record.RecordRemoveFieldNodeGen; import scala.collection.JavaConverters; public class TruffleRecordRemoveFieldEntry extends RecordRemoveFieldEntry diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java index 4a97c0564..d0fc643e1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.regex_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RegexFirstMatchInEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexFirstMatchInNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RegexFirstMatchInEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.regex_package.RegexFirstMatchInNodeGen; public class TruffleRegexFirstMatchInEntry extends RegexFirstMatchInEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexGroupsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexGroupsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java index 26a223be6..23dcd0740 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexGroupsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.regex_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RegexGroupsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexGroupsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RegexGroupsEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.regex_package.RegexGroupsNodeGen; public class TruffleRegexGroupsEntry extends RegexGroupsEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexMatchesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexMatchesEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java index 32d486351..f2a8817b0 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexMatchesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.regex_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RegexMatchesEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexMatchesNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RegexMatchesEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.regex_package.RegexMatchesNodeGen; public class TruffleRegexMatchesEntry extends RegexMatchesEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexReplaceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexReplaceEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java index 998d2d8b7..144a4cc9a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/regex_extension/TruffleRegexReplaceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.regex_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.RegexReplaceEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexReplaceNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.RegexReplaceEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.regex_package.RegexReplaceNodeGen; public class TruffleRegexReplaceEntry extends RegexReplaceEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/s3_extension/TruffleS3BuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java similarity index 61% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/s3_extension/TruffleS3BuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java index 317e659d1..e5f081f21 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/s3_extension/TruffleS3BuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.s3_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.s3_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.S3BuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromS3Node; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.S3BuildEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromS3Node; public class TruffleS3BuildEntry extends S3BuildEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/short_extension/TruffleShortFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java similarity index 55% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/short_extension/TruffleShortFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java index c788523df..d5fe0d01f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/short_extension/TruffleShortFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.short_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.short_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.ShortFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.short_package.ShortFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.ShortFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.numeric.short_package.ShortFromNodeGen; public class TruffleShortFromEntry extends ShortFromEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java similarity index 60% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java index 1148b98d5..c317d380e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.snowflake_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeQueryEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSnowflakeCredentialNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSnowflakeNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.SnowflakeExceptionHandler; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.SnowflakeQueryEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.compiler.snapi.truffle.builtin.jdbc.Jdbc; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromSnowflakeCredentialNode; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromSnowflakeNode; -import raw.runtime.truffle.runtime.exceptions.rdbms.SnowflakeExceptionHandler; public class TruffleSnowflakeQueryEntry extends SnowflakeQueryEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java index 92f870742..44f1a777d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.sqlserver_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.SQLServerQueryEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSQLServerCredentialNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSQLServerNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.SqlServerExceptionHandler; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.SQLServerQueryEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.compiler.snapi.truffle.builtin.jdbc.Jdbc; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromSQLServerCredentialNode; -import raw.runtime.truffle.ast.expressions.builtin.location_package.LocationFromSQLServerNode; -import raw.runtime.truffle.ast.expressions.literals.IntNode; -import raw.runtime.truffle.runtime.exceptions.rdbms.SqlServerExceptionHandler; public class TruffleSQLServerQueryEntry extends SQLServerQueryEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleBase64EntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleBase64EntryExtension.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java index 44a2d1650..7b1dbda9c 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleBase64EntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.Base64EntryExtension; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringBase64NodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.Base64EntryExtension; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringBase64NodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringCapitalizeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringCapitalizeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java index 1b9c08bc6..292a61c7c 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringCapitalizeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringCapitalizeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringCapitalizeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringCapitalizeEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringCapitalizeNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringContainsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringContainsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java index ae60cd0ed..f48d327ab 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringContainsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringContainsEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringContainsNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringContainsEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringContainsNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringCountSubStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringCountSubStringEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java index 22e623a63..3549d2d6e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringCountSubStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringCountSubStringEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringCountSubStringNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringCountSubStringEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringCountSubStringNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringDecodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringDecodeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java index 07d9ee1df..7cc4b4705 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringDecodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringDecodeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringDecodeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringDecodeEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringDecodeNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringEmptyEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java index 3ecbe007d..4d26fdb18 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringEmptyEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringEmptyNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringEmptyEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringEmptyNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringEncodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringEncodeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java index 0cfe71df9..ed324a84d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringEncodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringEncodeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringEncodeNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringEncodeEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringEncodeNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringFromEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java index 84b6e7947..5a009e942 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.StringFromEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringFromNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.StringFromEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringFromNodeGen; public class TruffleStringFromEntry extends StringFromEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLTrimEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java index d68248a4c..ce52ca4d6 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringLTrimEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLTrimNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringLTrimEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringLTrimNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLengthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLengthEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java index 5c37ee007..db5b4df07 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLengthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringLengthEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLengthNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringLengthEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringLengthNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java index 3bfaf32eb..e56ab83a8 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringLevenshteinDistanceEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLevenshteinDistanceNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringLevenshteinDistanceEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringLevenshteinDistanceNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLowerEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLowerEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java index a47d2b3ed..839478fb2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringLowerEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringLowerEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLowerNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringLowerEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringLowerNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringRTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringRTrimEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java index 0565f300b..6d39f745e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringRTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringRTrimEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringRTrimNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringRTrimEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringRTrimNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java similarity index 61% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReadEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java index 9b312b90e..8e8717a39 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.StringReadEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReadNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.StringReadEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringReadNodeGen; -import raw.runtime.truffle.ast.expressions.literals.StringNode; public class TruffleStringReadEntry extends StringReadEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReadLinesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java similarity index 61% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReadLinesEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java index a644b3f25..caf3ab38e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReadLinesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.StringReadLinesEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReadLinesNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.StringReadLinesEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringReadLinesNodeGen; -import raw.runtime.truffle.ast.expressions.literals.StringNode; public class TruffleStringReadLinesEntry extends StringReadLinesEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReplaceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReplaceEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java index 7c57f1b6a..bb4a44039 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReplaceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.StringReplaceEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReplaceNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.StringReplaceEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringReplaceNodeGen; public class TruffleStringReplaceEntry extends StringReplaceEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReplicateEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReplicateEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java index 5f10da827..dfcd2d9bd 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReplicateEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringReplicateEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReplicateNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringReplicateEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringReplicateNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReverseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReverseEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java index a5ba46e3d..b0c09e799 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringReverseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringReverseEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReverseNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringReverseEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringReverseNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringSplitEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringSplitEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java index 0eb2ef694..2e9ef4fb1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringSplitEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringSplitEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringSplitNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringSplitEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringSplitNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringStartsWithEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringStartsWithEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java index 678b0526b..cf9d18653 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringStartsWithEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringStartsWithEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringStartsWithNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringStartsWithEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringStartsWithNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringSubStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringSubStringEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java index 6cb007e45..d397138a2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringSubStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringSubStringEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringSubStringNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringSubStringEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringSubStringNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringTrimEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java index dbb88f4f4..4e5aac3b3 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringTrimEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringTrimNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringTrimEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringTrimNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringUpperEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringUpperEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java index fd9ffe405..8e93c601f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/string_extension/TruffleStringUpperEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.string_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.StringUpperEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringUpperNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.StringUpperEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.string_package.StringUpperNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/success_extension/TruffleSuccessBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/success_extension/TruffleSuccessBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java index 42f8000ef..071688eff 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/success_extension/TruffleSuccessBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.success_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.success_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.SuccessBuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableSuccessNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.SuccessBuildEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableSuccessNodeGen; public class TruffleSuccessBuildEntry extends SuccessBuildEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleBoolValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleBoolValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java index e64fb94c9..f87aeacc7 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleBoolValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.BoolValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.BoolValueArgTestEntry; public class TruffleBoolValueArgTestEntry extends BoolValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleByteValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java similarity index 71% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleByteValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java index 22a46709b..eab3a588a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleByteValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.ByteValueArgTestEntry; -import raw.compiler.snapi.truffle.TruffleEntryExtension; +import com.rawlabs.snapi.frontend.rql2.builtin.ByteValueArgTestEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; public class TruffleByteValueArgTestEntry extends ByteValueArgTestEntry implements TruffleEntryExtension, TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleDateValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleDateValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java index 2f45ddf63..4dae1b051 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleDateValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.DateValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.DateValueArgTestEntry; public class TruffleDateValueArgTestEntry extends DateValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleDoubleValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleDoubleValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java index eef9609ed..ebd499d61 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleDoubleValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.DoubleValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.DoubleValueArgTestEntry; public class TruffleDoubleValueArgTestEntry extends DoubleValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleFloatValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleFloatValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java index db6c4c4be..773aa3291 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleFloatValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.FloatValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.FloatValueArgTestEntry; public class TruffleFloatValueArgTestEntry extends FloatValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleIntValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleIntValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java index 0dde30a63..1e47bb9ca 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleIntValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.IntValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.IntValueArgTestEntry; public class TruffleIntValueArgTestEntry extends IntValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleIntervalValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleIntervalValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java index b30a12437..a6507567b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleIntervalValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.IntervalValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.IntervalValueArgTestEntry; public class TruffleIntervalValueArgTestEntry extends IntervalValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleListValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleListValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java index fc7868dc4..e3e4ebc36 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleListValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.ListValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.ListValueArgTestEntry; public class TruffleListValueArgTestEntry extends ListValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleLongValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleLongValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java index 4b415c353..e6d348778 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleLongValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.LongValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.LongValueArgTestEntry; public class TruffleLongValueArgTestEntry extends LongValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java similarity index 60% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryArgs.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java index 72f28b1b8..3711a6f32 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.binary.PlusNode; public interface TruffleMandatoryArgs extends TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryExpArgsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java similarity index 78% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryExpArgsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java index 3d90d02ad..6cc934650 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryExpArgsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.MandatoryExpArgsEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.MandatoryExpArgsEntry; public class TruffleMandatoryExpArgsEntry extends MandatoryExpArgsEntry implements TruffleMandatoryArgs {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryValueArgsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java similarity index 78% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryValueArgsEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java index 2bcb73a4e..ad11e5faa 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleMandatoryValueArgsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.MandatoryValueArgsEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.MandatoryValueArgsEntry; public class TruffleMandatoryValueArgsEntry extends MandatoryValueArgsEntry implements TruffleMandatoryArgs {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java similarity index 60% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalArgs.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java index a9674df69..ade84dc09 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.MultNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.binary.MultNodeGen; -import raw.runtime.truffle.ast.expressions.literals.IntNode; public interface TruffleOptionalArgs extends TruffleEntryExtension, WithArgs { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java index 0689a9d00..451711002 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.OptionalExpArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.OptionalExpArgsTestEntry; public class TruffleOptionalExpArgsTestEntry extends OptionalExpArgsTestEntry implements TruffleOptionalArgs {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java index cf583e0f8..25b5eae9e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.OptionalValueArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.OptionalValueArgsTestEntry; public class TruffleOptionalValueArgsTestEntry extends OptionalValueArgsTestEntry implements TruffleOptionalArgs {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleRecordValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleRecordValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java index 8b9ee4b7c..fee7a868a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleRecordValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.RecordValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.RecordValueArgTestEntry; public class TruffleRecordValueArgTestEntry extends RecordValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleShortValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleShortValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java index 2986f8635..1f14505a1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleShortValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.ShortValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.ShortValueArgTestEntry; public class TruffleShortValueArgTestEntry extends ShortValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java similarity index 52% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java index 99bc30aa8..f306544bb 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsColPassThroughTestEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.MultNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTransformNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.runtime.ast.local.ReadParamNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.StrictArgsColPassThroughTestEntry; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.binary.MultNodeGen; -import raw.runtime.truffle.ast.expressions.iterable.collection.CollectionTransformNodeGen; -import raw.runtime.truffle.ast.expressions.literals.IntNode; -import raw.runtime.truffle.ast.local.ReadParamNode; public class TruffleStrictArgsColPassThroughTestEntry extends StrictArgsColPassThroughTestEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStrictArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java similarity index 52% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStrictArgsTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java index 8a90440c6..9a9fcffbb 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStrictArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsTestEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListCountNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.FloatNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.LongNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordBuildNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordProjNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.StrictArgsTestEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.WithArgs; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.binary.PlusNode; -import raw.runtime.truffle.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; -import raw.runtime.truffle.ast.expressions.iterable.list.ListCountNodeGen; -import raw.runtime.truffle.ast.expressions.literals.FloatNode; -import raw.runtime.truffle.ast.expressions.literals.LongNode; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.expressions.record.RecordBuildNode; -import raw.runtime.truffle.ast.expressions.record.RecordProjNodeGen; public class TruffleStrictArgsTestEntry extends StrictArgsTestEntry implements TruffleEntryExtension, WithArgs { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStringValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStringValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java index c78664e5e..a63d6d145 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleStringValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.StringValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.StringValueArgTestEntry; public class TruffleStringValueArgTestEntry extends StringValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleTimeValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleTimeValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java index e80eb9e01..770d98dfb 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleTimeValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.TimeValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeValueArgTestEntry; public class TruffleTimeValueArgTestEntry extends TimeValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleTimestampValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleTimestampValueArgTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java index 1c8a88d03..ce0c3f980 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleTimestampValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.TimestampValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampValueArgTestEntry; public class TruffleTimestampValueArgTestEntry extends TimestampValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleValueArg.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java similarity index 61% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleValueArg.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java index 525f626e7..21d4f7ab0 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleValueArg.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordBuildNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.record.RecordBuildNode; public interface TruffleValueArg extends TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java similarity index 59% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarArgs.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java index 7591e0691..d21cbf46b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.binary.PlusNode; -import raw.runtime.truffle.ast.expressions.literals.IntNode; public interface TruffleVarArgs extends TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarExpArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarExpArgsTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java index 224b9bc63..08d78ca4f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarExpArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.VarExpArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.VarExpArgsTestEntry; public class TruffleVarExpArgsTestEntry extends VarExpArgsTestEntry implements TruffleVarArgs {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java similarity index 61% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java index cc51fe146..9baa17409 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringExpTestEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.VarNullableStringExpTestEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; public class TruffleVarNullableStringExpTestEntry extends VarNullableStringExpTestEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java similarity index 56% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java index d1c617f4d..73a05cbf4 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringValueTestEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionGetOrElseNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.VarNullableStringValueTestEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.binary.PlusNode; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.expressions.option.OptionGetOrElseNodeGen; public class TruffleVarNullableStringValueTestEntry extends VarNullableStringValueTestEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarValueArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java similarity index 77% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarValueArgsTestEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java index dd300115f..6c1a78f39 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/test_extension/TruffleVarValueArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.test_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import raw.compiler.rql2.builtin.VarValueArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.builtin.VarValueArgsTestEntry; public class TruffleVarValueArgsTestEntry extends VarValueArgsTestEntry implements TruffleVarArgs {} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeAddIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java index 206bb909d..351bad260 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeAddIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeAddIntervalNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeAddIntervalEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeAddIntervalNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java index e1ccaa8d3..a3cf4ab17 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeBuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeBuildNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeBuildEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeBuildNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeHourEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeHourEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java index ab3d8293a..f02cf8e22 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeHourEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeHourEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeHourNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeHourEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeHourNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeMillisEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java index 9f39bbbec..8dc54f481 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeMillisEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeMillisNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeMillisEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeMillisNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeMinuteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeMinuteEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java index 5fa3f1541..bd6b55e3d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeMinuteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeMinuteEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeMinuteNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeMinuteEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeMinuteNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeNowEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java index 3b88697bf..237c1b812 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeNowEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeNowNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeNowEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeNowNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeParseEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java index 4987e3a40..671d7faf0 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeParseEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeParseNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeParseEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeParseNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSecondEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSecondEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java index 2ff8dad07..b9a578f7f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSecondEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeSecondEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeSecondNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeSecondEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeSecondNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSubtractEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java index 5a2cf45fe..fd423c394 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeSubtractNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeSubtractEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeSubtractNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java index 5bd20ff23..c28773269 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.time_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeSubtractIntervalNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimeSubtractIntervalEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.time_package.TimeSubtractIntervalNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java index 9fd6314c2..1c6006f4a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampAddIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampAddIntervalNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampAddIntervalEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampAddIntervalNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java similarity index 65% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampBuildEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java index ff42da0d5..d11f1abd7 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampBuildEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampBuildNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampBuildEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampBuildNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampDayEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java index 90d38f485..d4b53b64a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampDayEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampDayNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampDayEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampDayNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java index 593fc1e42..0adf1c532 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromDateEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampFromDateNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampFromDateEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampFromDateNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java index 247d843e0..19d69fb99 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromUnixTimestampEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampFromUnixTimestampNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampFromUnixTimestampEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampFromUnixTimestampNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampHourEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampHourEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java index 31ed75410..58e972743 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampHourEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampHourEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampHourNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampHourEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampHourNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMillisEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java index b07c64b6c..d5e488a04 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampMillisEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampMillisNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampMillisEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMillisNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java index 13abbe2af..64e774f0f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampMinuteEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampMinuteNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampMinuteEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMinuteNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMonthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMonthEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java index 2433e22e6..3c0a76a82 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampMonthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampMonthEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampMonthNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampMonthEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMonthNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java similarity index 62% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampNowEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java index d3601d734..dc1b75e82 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampNowEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampNowNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampNowEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampNowNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampParseEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java index 2506db2d0..a626ae598 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampParseEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampParseNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampParseEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampParseNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampRangeEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java index b1eac8ce6..bc4f87767 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampRangeEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampRangeNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TimestampRangeEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampRangeNodeGen; -import raw.runtime.truffle.ast.expressions.literals.IntNode; public class TruffleTimestampRangeEntry extends TimestampRangeEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSecondEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSecondEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java index 08824a4fa..e53cae473 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSecondEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampSecondEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampSecondNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampSecondEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSecondNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java index ee5edfa2c..f7774f0b5 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampSubtractEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java index 149633429..c87fd91f4 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractIntervalEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractIntervalNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampSubtractIntervalEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractIntervalNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java similarity index 52% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java index b9be1066c..977340749 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TimestampTimeBucketEntry; -import raw.compiler.rql2.source.Rql2IntervalType; -import raw.compiler.rql2.source.Rql2StringType; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ExpressionNode; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketIntervalNodeGen; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketStringNodeGen; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampTimeBucketEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IntervalType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2StringType; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketIntervalNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketStringNodeGen; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import java.util.List; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java index d71477bc8..dca83b894 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampToUnixTimestampEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampToUnixTimestampNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampToUnixTimestampEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampToUnixTimestampNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampYearEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java similarity index 63% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampYearEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java index 6234a5362..ae63ba60f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/timestamp_extension/TruffleTimestampYearEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.timestamp_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.builtin.TimestampYearEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampYearNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.rql2.builtin.TimestampYearEntry; -import raw.compiler.snapi.truffle.TruffleShortEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampYearNodeGen; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryFlatMapEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryFlatMapEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java index 876148081..fe848aa48 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryFlatMapEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.try_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TryFlatMapEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableMapNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TryFlatMapEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableMapNodeGen; public class TruffleTryFlatMapEntry extends TryFlatMapEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryIsErrorEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryIsErrorEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java index 479cd7dcd..9f9f0ede3 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryIsErrorEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.try_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TryIsErrorEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableIsFailureNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TryIsErrorEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableIsFailureNodeGen; public class TruffleTryIsErrorEntry extends TryIsErrorEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryIsSuccessEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryIsSuccessEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java index b3c6b1096..cdbeae3a1 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryIsSuccessEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.try_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TryIsSuccessEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableIsSuccessNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TryIsSuccessEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableIsSuccessNodeGen; public class TruffleTryIsSuccessEntry extends TryIsSuccessEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryTransformEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java similarity index 58% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryTransformEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java index c72798ada..aa527a069 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryTransformEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.try_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TryTransformEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableMapNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TryTransformEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableMapNodeGen; public class TruffleTryTransformEntry extends TryTransformEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryUnsafeGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java similarity index 57% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryUnsafeGetEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java index 426021f4b..5b4c5a122 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/try_extension/TruffleTryUnsafeGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.try_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TryUnsafeGetEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableUnsafeGetNodeGen; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TryUnsafeGetEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.tryable.TryableUnsafeGetNodeGen; public class TruffleTryUnsafeGetEntry extends TryUnsafeGetEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeCastEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java similarity index 60% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeCastEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java index 2973c1e1b..70bd52142 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeCastEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.type_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TypeCastEntry; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TypeCastEntry; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; public class TruffleTypeCastEntry extends TypeCastEntry implements TruffleEntryExtension { public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java similarity index 55% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeEmptyEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java index c2f492d29..53b423492 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.type_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TypeEmptyEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.ZeroedConstNode; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TypeEmptyEntry; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.literals.ZeroedConstNode; public class TruffleTypeEmptyEntry extends TypeEmptyEntry implements TruffleEntryExtension { @Override diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeMatchEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java similarity index 72% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeMatchEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java index 4ed4114c2..1391cab1f 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeMatchEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.type_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.TypesMerger; +import com.rawlabs.snapi.frontend.rql2.builtin.TypeMatchEntry; +import com.rawlabs.snapi.frontend.rql2.source.FunType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2OrType; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package.TypeMatchNode; import java.util.Comparator; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.TypesMerger; -import raw.compiler.rql2.builtin.TypeMatchEntry; -import raw.compiler.rql2.source.FunType; -import raw.compiler.rql2.source.Rql2OrType; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.type_package.TypeMatchNode; public class TruffleTypeMatchEntry extends TypeMatchEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeProtectCastEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java similarity index 84% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeProtectCastEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java index 08b1c8e56..dceb9c28a 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/type_extension/TruffleTypeProtectCastEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.type_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.builtin.TypeProtectCastEntry; -import raw.compiler.rql2.source.*; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.type_package.TypeProtectCastOptionNode; -import raw.runtime.truffle.ast.expressions.builtin.type_package.TypeProtectCastTryableNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.builtin.TypeProtectCastEntry; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package.TypeProtectCastOptionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package.TypeProtectCastTryableNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import scala.collection.JavaConverters; import java.util.HashSet; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/TruffleParseXmlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java similarity index 81% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/TruffleParseXmlEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java index 1c73a82d7..7a8e57e88 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/TruffleParseXmlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java @@ -10,28 +10,28 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.xml_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.xml_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.ParseXmlEntry; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2ListType; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFromNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFromUnsafe; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.io.json.reader.TryableTopLevelWrapper; -import raw.runtime.truffle.ast.io.xml.parser.XmlParseCollectionNode; -import raw.runtime.truffle.ast.io.xml.parser.XmlParseValueNode; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.ParseXmlEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromUnsafe; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlParseCollectionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlParseValueNode; public class TruffleParseXmlEntry extends ParseXmlEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/TruffleReadXmlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java similarity index 81% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/TruffleReadXmlEntry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java index 9352106f0..1fe0e11c3 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/TruffleReadXmlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java @@ -10,28 +10,28 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.xml_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.xml_extension; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import java.util.List; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.builtin.ReadXmlEntry; -import raw.compiler.rql2.source.Rql2IterableType; -import raw.compiler.rql2.source.Rql2ListType; -import raw.compiler.rql2.source.Rql2Type; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.compiler.snapi.truffle.TruffleArg; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFromNode; -import raw.runtime.truffle.ast.expressions.iterable.list.ListFromUnsafe; -import raw.runtime.truffle.ast.expressions.literals.StringNode; -import raw.runtime.truffle.ast.io.json.reader.TryableTopLevelWrapper; -import raw.runtime.truffle.ast.io.xml.parser.XmlReadCollectionNode; -import raw.runtime.truffle.ast.io.xml.parser.XmlReadValueNode; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.builtin.ReadXmlEntry; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.emitter.TruffleArg; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromUnsafe; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlReadCollectionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlReadValueNode; public class TruffleReadXmlEntry extends ReadXmlEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/XmlRecurse.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java similarity index 92% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/XmlRecurse.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java index 0984edbe5..93e157c2d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/builtin/xml_extension/XmlRecurse.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.builtin.xml_extension; +package com.rawlabs.snapi.truffle.emitter.builtin.xml_extension; import com.oracle.truffle.api.frame.FrameDescriptor; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.expressions.option.OptionSomeNodeGen; -import raw.runtime.truffle.ast.io.xml.parser.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionSomeNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import scala.collection.JavaConverters; import java.util.stream.Stream; diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SlotLocation.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SlotLocation.java similarity index 89% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SlotLocation.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SlotLocation.java index f1d5d7611..f152bd87c 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SlotLocation.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SlotLocation.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.compiler; +package com.rawlabs.snapi.truffle.emitter.compiler; public record SlotLocation(int depth, int slot) {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java new file mode 100644 index 000000000..a38a66b8e --- /dev/null +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java @@ -0,0 +1,659 @@ +/* + * Copyright 2023 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.truffle.emitter.compiler; + +import java.util.*; + +import com.oracle.truffle.api.RootCallTarget; +import com.oracle.truffle.api.frame.FrameDescriptor; +import com.oracle.truffle.api.frame.FrameSlotKind; +import org.bitbucket.inkytonik.kiama.relation.TreeRelation; +import org.bitbucket.inkytonik.kiama.util.Entity; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.common.source.IdnExp; +import com.rawlabs.snapi.frontend.common.source.SourceNode; +import com.rawlabs.snapi.frontend.rql2.*; +import com.rawlabs.snapi.frontend.rql2.api.EntryExtension; +import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; +import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; +import com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationFromStringEntry; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.controlflow.ExpBlockNode; +import com.rawlabs.snapi.truffle.runtime.ast.controlflow.IfThenElseNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.*; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.DivNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.ModNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.MultNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.SubNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.function.*; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.*; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionNoneNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordProjNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.unary.NegNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.unary.NotNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.local.*; +import com.rawlabs.snapi.truffle.runtime.ast.local.ReadClosureVariableNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.local.ReadLocalVariableNodeGen; +import com.rawlabs.snapi.truffle.runtime.ast.local.WriteLocalVariableNodeGen; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; +import scala.collection.JavaConverters; + +public class SnapiTruffleEmitter extends TruffleEmitter { + + private final Tree tree; + private final RawLanguage rawLanguage; + private final ProgramContext programContext; + private final SemanticAnalyzer analyzer; + private final String uniqueId = UUID.randomUUID().toString().replace("-", "").replace("_", ""); + private int idnCounter = 0; + private final HashMap idnSlot = new HashMap<>(); + private final List> slotMapScope = new LinkedList<>(); + private final List frameDescriptorBuilderScope = new LinkedList<>(); + + private int funcCounter = 0; + private final HashMap funcMap = new HashMap<>(); + private final HashMap entityDepth = new HashMap<>(); + + private static final EntryExtension[] entries = { + new com.rawlabs.snapi.truffle.emitter.builtin.aws_extension.TruffleAwsV4SignedRequestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.byte_extension.TruffleByteFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleEmptyCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleBuildCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFilterCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleOrderByCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTransformCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleDistinctCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleCountCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTupleAvgCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMinCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMaxCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleSumCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFirstCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleLastCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTakeCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnnestCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFromCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleGroupCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleInternalJoinCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleInternalEquiJoinCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnionCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleExistsCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleZipCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMkStringCollectionEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvReadEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvParseEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.double_extension.TruffleDoubleFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentParameterEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildWithTypeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorGetEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.float_extension.TruffleFloatFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.function_extension.TruffleFunctionInvokeAfterEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleBuildIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntRangeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleReadJsonEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleParseJsonEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TrufflePrintJsonEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleEmptyListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleBuildListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGetListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFilterListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTransformListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTakeListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleSumListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMaxListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMinListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFirstListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleLastListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleCountListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFromListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleUnsafeFromListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGroupListEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleExistsListEntry(), + new TruffleLocationFromStringEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationDescribeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLlEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongRangeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAbsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension.TruffleMySQLQueryEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableEmptyEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableIsNullEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableUnsafeGetEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableTransformEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.nullable_tryable_extension.TruffleFlatMapNullableTryableEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension.TruffleOracleQueryEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordConcatEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordFieldsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordAddFieldEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordRemoveFieldEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordGetFieldByIndexEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension.TruffleSnowflakeQueryEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromEpochDayEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromTimestampEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateParseEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateNowEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateYearEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateMonthEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateDayEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateAddIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalRoundEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentSecretEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentScopesEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalToMillisEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalFromMillisEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalParseEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalYearsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMonthsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalWeeksEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalDaysEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalHoursEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMinutesEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalSecondsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMillisEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPiEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRandomEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPowerEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtn2Entry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAcosEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAsinEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtanEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCeilingEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCosEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCotEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathDegreesEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathExpEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLogEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLog10Entry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRadiansEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSignEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSinEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSqrtEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathTanEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSquareEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathFloorEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpReadEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpGetEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPostEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPutEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpDeleteEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpHeadEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPatchEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpOptionsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlEncode(), + new com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlDecode(), + new com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleReadXmlEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleParseXmlEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeCastEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeEmptyEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeMatchEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeProtectCastEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryBase64Entry(), + new com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryReadEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleFromStringBinaryEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampFromDateEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampParseEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampNowEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampRangeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampYearEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMonthEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampDayEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampHourEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMinuteEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSecondEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMillisEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampFromUnixTimestampEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampToUnixTimestampEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSubtractEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampAddIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSubtractIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeParseEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeNowEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeHourEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMinuteEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSecondEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMillisEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeAddIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractIntervalEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryFlatMapEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryUnsafeGetEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsErrorEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsSuccessEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryTransformEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.success_extension.TruffleSuccessBuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringContainsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringTrimEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLTrimEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringRTrimEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplaceEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReverseEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplicateEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringUpperEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLowerEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSplitEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLengthEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSubStringEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCountSubStringEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringStartsWithEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEmptyEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleBase64EntryExtension(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEncodeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringDecodeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLevenshteinDistanceEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadLinesEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCapitalizeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension.TruffleSQLServerQueryEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.short_extension.TruffleShortFromEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexReplaceEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexMatchesEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexFirstMatchInEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexGroupsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.s3_extension.TruffleS3BuildEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleByteValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleBoolValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleDateValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleDoubleValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleFloatValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleIntervalValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleIntValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleListValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleLongValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleMandatoryExpArgsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleMandatoryValueArgsEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleOptionalExpArgsTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleOptionalValueArgsTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleRecordValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleShortValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStrictArgsColPassThroughTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStrictArgsTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStringValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleTimestampValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleTimeValueArgTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarExpArgsTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarNullableStringExpTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarNullableStringValueTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarValueArgsTestEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension.TruffleKryoDecodeEntry(), + new com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension.TruffleKryoEncodeEntry() + }; + + private static TruffleEntryExtension getEntry(String pkgName, String entName) { + for (EntryExtension entry : entries) { + if (entry.packageName().equals(pkgName) && entry.entryName().equals(entName)) { + return (TruffleEntryExtension) entry; + } + } + throw new RawTruffleInternalErrorException("Could not find entry for " + pkgName + "." + entName); + } + + public SnapiTruffleEmitter(Tree tree, RawLanguage rawLanguage, ProgramContext programContext) { + this.tree = tree; + this.analyzer = tree.analyzer(); + this.rawLanguage = rawLanguage; + this.programContext = programContext; + } + + private Type tipe(Exp e) { + return analyzer.tipe(e); + } + + public RawLanguage getLanguage() { + return this.rawLanguage; + } + + private int getCurrentDepth() { + return slotMapScope.size(); + } + + private void setEntityDepth(Entity e) { + entityDepth.put(e, getCurrentDepth()); + } + + private int getEntityDepth(Entity e) { + return entityDepth.get(e); + } + + private String getIdnName(Entity entity) { + return idnSlot.putIfAbsent(entity, String.format("idn%s_%d", uniqueId, ++idnCounter)); + } + + protected void addScope() { + slotMapScope.add(0, new HashMap<>()); + frameDescriptorBuilderScope.add(0, FrameDescriptor.newBuilder()); + } + + protected FrameDescriptor dropScope() { + slotMapScope.remove(0); + FrameDescriptor.Builder frameDescriptorBuilder = frameDescriptorBuilderScope.remove(0); + return frameDescriptorBuilder.build(); + } + + public FrameDescriptor.Builder getFrameDescriptorBuilder() { + return frameDescriptorBuilderScope.get(0); + } + + private void addSlot(Entity entity, String slot) { + slotMapScope.get(0).put(entity, slot); + } + + protected StatementNode emitMethod(Rql2Method m) { + Entity entity = analyzer.entity().apply(m.i()); + FunProto fp = m.p(); + Function f = recurseFunProto(fp); + ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(fp.ps()).stream() + .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) + .toArray(ExpressionNode[]::new); + ExpressionNode node; + boolean hasFreeVars = analyzer.freeVars(m).nonEmpty(); + node = new MethodNode(m.i().idn(), f, defaultArgs, hasFreeVars); + int slot = getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + addSlot(entity, Integer.toString(slot)); + return WriteLocalVariableNodeGen.create(node, slot, null); + } + + private SlotLocation findSlot(Entity entity) { + for (int depth = 0; ; depth++) { + HashMap curSlot = slotMapScope.get(depth); + String slot = curSlot.get(entity); + if (slot != null) { + return new SlotLocation(depth, Integer.parseInt(slot)); + } + } + } + + private String getFuncIdn(Entity entity) { + return funcMap.putIfAbsent(entity, String.format("func%s_%d", uniqueId, ++funcCounter)); + } + + private String getLambdaFuncIdn() { + return String.format("func%s_%d", uniqueId, ++funcCounter); + } + + private StatementNode recurseLetDecl(LetDecl ld) { + return switch (ld) { + case LetBind lb -> { + Entity entity = analyzer.entity().apply(lb.i()); + Rql2Type rql2Type = (Rql2Type) tipe(lb.e()); + int slot = switch (rql2Type) { + case Rql2UndefinedType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case ExpType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2ByteType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Byte, getIdnName(entity), null); + case Rql2ShortType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Int, getIdnName(entity), null); + case Rql2IntType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Int, getIdnName(entity), null); + case Rql2LongType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Long, getIdnName(entity), null); + case Rql2FloatType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Float, getIdnName(entity), null); + case Rql2DoubleType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Double, getIdnName(entity), null); + case Rql2DecimalType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2BoolType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Boolean, getIdnName(entity), null); + case Rql2StringType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2DateType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2TimeType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2TimestampType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2IntervalType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2BinaryType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2IterableType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2ListType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case FunType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2RecordType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case Rql2LocationType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case PackageType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + case PackageEntryType ignored -> + getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + default -> throw new RawTruffleInternalErrorException(); + }; + addSlot(entity, Integer.toString(slot)); + yield WriteLocalVariableNodeGen.create(recurseExp(lb.e()), slot, rql2Type); + } + case LetFun lf -> { + Entity entity = analyzer.entity().apply(lf.i()); + Function f = recurseFunProto(lf.p()); + boolean hasFreeVars = analyzer.freeVars(lf).nonEmpty(); + ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(lf.p().ps()).stream() + .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) + .toArray(ExpressionNode[]::new); + + ExpressionNode node; + // If the function has free variables it is a Closure + if (hasFreeVars) { + node = new ClosureNode(f, defaultArgs); + } + // If the function has optional arguments it is a Method + else { + node = new MethodNode(null, f, defaultArgs, hasFreeVars); + } + int slot = getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + addSlot(entity, Integer.toString(slot)); + yield WriteLocalVariableNodeGen.create(node, slot, null); + } + case LetFunRec lfr -> { + Entity entity = analyzer.entity().apply(lfr.i()); + int slot = getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); + addSlot(entity, Integer.toString(slot)); + Function f = recurseFunProto(lfr.p()); + ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(lfr.p().ps()).stream() + .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) + .toArray(ExpressionNode[]::new); + RecClosureNode functionLiteralNode = new RecClosureNode(f, defaultArgs); + yield WriteLocalVariableNodeGen.create(functionLiteralNode, slot, null); + } + default -> throw new RawTruffleInternalErrorException(); + }; + } + + private Function recurseFunProto(FunProto fp) { + addScope(); + JavaConverters.asJavaCollection(fp.ps()) + .forEach(p -> setEntityDepth(analyzer.entity().apply(p.i()))); + + ExpressionNode functionBody = recurseExp(fp.b().e()); + FrameDescriptor funcFrameDescriptor = dropScope(); + + ProgramExpressionNode functionRootBody = + new ProgramExpressionNode(rawLanguage, funcFrameDescriptor, functionBody); + + RootCallTarget rootCallTarget = functionRootBody.getCallTarget(); + + String[] argNames = + JavaConverters.asJavaCollection(fp.ps()).stream() + .map(p -> p.i().idn()) + .toArray(String[]::new); + + return new Function(rootCallTarget, argNames); + } + + // Used only for tests at the moment + public ClosureNode recurseLambda(TruffleBuildBody truffleBuildBody) { + addScope(); + ExpressionNode functionBody = truffleBuildBody.buildBody(); + FrameDescriptor funcFrameDescriptor = dropScope(); + + ProgramExpressionNode functionRootBody = new ProgramExpressionNode(rawLanguage, funcFrameDescriptor, functionBody); + + RootCallTarget rootCallTarget = functionRootBody.getCallTarget(); + Function f = new Function(rootCallTarget, new String[]{"x"}); + return new ClosureNode(f, new ExpressionNode[]{null}); + } + + public ExpressionNode recurseExp(Exp in) { + return switch (in) { + case Exp ignored when tipe(in) instanceof PackageType || tipe(in) instanceof PackageEntryType -> + new ZeroedConstNode(Rql2ByteType.apply(new scala.collection.immutable.HashSet().seq())); + case TypeExp typeExp -> new ZeroedConstNode((Rql2Type) typeExp.t()); + case NullConst ignored -> new OptionNoneNode(); + case BoolConst v -> new BoolNode(v.value()); + case ByteConst v -> new ByteNode(v.value()); + case ShortConst v -> new ShortNode(v.value()); + case IntConst v -> new IntNode(v.value()); + case LongConst v -> new LongNode(v.value()); + case FloatConst v -> new FloatNode(v.value()); + case DoubleConst v -> new DoubleNode(v.value()); + case DecimalConst v -> new DecimalNode(v.value()); + case StringConst v -> new StringNode(v.value()); + case TripleQuotedStringConst v -> new StringNode(v.value()); + case BinaryExp be -> switch (be.binaryOp()) { + case And ignored -> new AndNode(recurseExp(be.left()), recurseExp(be.right())); + case Or ignored -> new OrNode(recurseExp(be.left()), recurseExp(be.right())); + case Plus ignored -> new PlusNode(recurseExp(be.left()), recurseExp(be.right())); + case Sub ignored -> SubNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); + case Mult ignored -> MultNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); + case Mod ignored -> ModNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); + case Div ignored -> DivNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); + case Gt ignored -> new GtNode(recurseExp(be.left()), recurseExp(be.right())); + case Ge ignored -> new GeNode(recurseExp(be.left()), recurseExp(be.right())); + case Eq ignored -> new EqNode(recurseExp(be.left()), recurseExp(be.right())); + case Neq ignored -> NotNodeGen.create(new EqNode(recurseExp(be.left()), recurseExp(be.right()))); + case Lt ignored -> new LtNode(recurseExp(be.left()), recurseExp(be.right())); + case Le ignored -> new LeNode(recurseExp(be.left()), recurseExp(be.right())); + default -> throw new RawTruffleInternalErrorException(); + }; + case BinaryConst bc -> new BinaryConstNode(bc.bytes()); + case LocationConst lc -> new LocationConstNode(lc.bytes(), lc.publicDescription()); + case UnaryExp ue -> switch (ue.unaryOp()) { + case Neg ignored -> NegNodeGen.create(recurseExp(ue.exp())); + case Not ignored -> NotNodeGen.create(recurseExp(ue.exp())); + default -> throw new RawTruffleInternalErrorException(); + }; + case IdnExp ie -> { + Entity entity = analyzer.entity().apply(ie.idn()); + yield switch (entity) { + case MethodEntity b -> { + SlotLocation slotLocation = findSlot(b); + yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), null); + } + case LetBindEntity b -> { + SlotLocation slotLocation = findSlot(b); + yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), (Rql2Type) tipe(b.b().e())) : + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) tipe(b.b().e())); + } + case LetFunEntity f -> { + SlotLocation slotLocation = findSlot(f); + yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) analyzer.idnType(f.f().i())); + } + case LetFunRecEntity f -> { + SlotLocation slotLocation = findSlot(f); + yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) analyzer.idnType(f.f().i())); + } + case FunParamEntity f -> { + int depth = getCurrentDepth() - getEntityDepth(f); + if (depth == 0) { + TreeRelation p = tree.parent(); + FunProto fpr = (FunProto) JavaConverters.asJavaCollection(p.apply(f.f())) + .stream() + .filter(n -> n instanceof FunProto) + .findFirst() + .orElseThrow(); + List fp = JavaConverters.asJavaCollection(fpr.ps()).stream().map(fpar -> (FunParam) fpar).toList(); + int idx = fp.indexOf(f.f()); + yield new ReadParamNode(idx); + } else { + TreeRelation p = tree.parent(); + FunProto fpr = (FunProto) JavaConverters.asJavaCollection(p.apply(f.f())) + .stream() + .filter(n -> n instanceof FunProto) + .findFirst() + .orElseThrow(); + List fp = JavaConverters.asJavaCollection(fpr.ps()).stream().map(fpar -> (FunParam) fpar).toList(); + int idx = fp.indexOf(f.f()); + yield new ReadParamClosureNode(depth, idx); + } + } + default -> throw new RawTruffleInternalErrorException("Unknown entity type"); + }; + } + case IfThenElse ite -> new IfThenElseNode(recurseExp(ite.e1()), recurseExp(ite.e2()), recurseExp(ite.e3())); + case Proj proj -> RecordProjNodeGen.create(recurseExp(proj.e()), new StringNode(proj.i())); + case Let let -> { + StatementNode[] decls = JavaConverters.asJavaCollection(let.decls()).stream().map(this::recurseLetDecl).toArray(StatementNode[]::new); + yield new ExpBlockNode(decls, recurseExp(let.e())); + } + case FunAbs fa -> { + Function f = recurseFunProto(fa.p()); + boolean hasFreeVars = analyzer.freeVars(fa).nonEmpty(); + ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(fa.p().ps()).stream() + .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) + .toArray(ExpressionNode[]::new); + // If the function has free variables it is a Closure + if (hasFreeVars) { + yield new ClosureNode(f, defaultArgs); + } + // If the function has optional arguments it is a Method + else { + yield new MethodNode(null, f, defaultArgs, false); + } + } + case FunApp fa when tipe(fa.f()) instanceof PackageEntryType -> { + Type t = tipe(fa); + PackageEntryType pet = (PackageEntryType) tipe(fa.f()); + TruffleEntryExtension e = getEntry(pet.pkgName(), pet.entName()); + yield e.toTruffle( + t, + JavaConverters.asJavaCollection(fa.args()).stream().map(a -> new Rql2Arg(a.e(), tipe(a.e()), a.idn())).toList(), + this + ); + } + case FunApp fa -> { + String[] argNames = JavaConverters.asJavaCollection(fa.args()).stream().map(a -> a.idn().isDefined() ? a.idn().get() : null).toArray(String[]::new); + ExpressionNode[] exps = JavaConverters.asJavaCollection(fa.args()).stream().map(a -> recurseExp(a.e())).toArray(ExpressionNode[]::new); + yield new InvokeNode(recurseExp(fa.f()), argNames, exps); + } + default -> throw new RawTruffleInternalErrorException("Unknown expression type"); + }; + } +} diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleBuildBody.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleBuildBody.java similarity index 80% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleBuildBody.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleBuildBody.java index 4d0bda51f..87599dca2 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleBuildBody.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleBuildBody.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.compiler; +package com.rawlabs.snapi.truffle.emitter.compiler; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public interface TruffleBuildBody { public ExpressionNode buildBody(); diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleEmit.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEmit.java similarity index 64% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleEmit.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEmit.java index a14796863..b5e9d5cbf 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleEmit.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEmit.java @@ -10,29 +10,29 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.compiler; +package com.rawlabs.snapi.truffle.emitter.compiler; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.nodes.RootNode; -import raw.client.api.Entrypoint; -import raw.compiler.common.source.Exp; -import raw.compiler.common.source.SourceProgram; -import raw.compiler.rql2.ProgramContext; -import raw.compiler.rql2.Tree; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.controlflow.ExpBlockNode; +import com.rawlabs.compiler.Entrypoint; +import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.common.source.SourceProgram; +import com.rawlabs.snapi.frontend.rql2.ProgramContext; +import com.rawlabs.snapi.frontend.rql2.Tree; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.controlflow.ExpBlockNode; import scala.collection.JavaConverters; public class TruffleEmit { public static Entrypoint doEmit( SourceProgram program, RawLanguage language, - raw.compiler.base.ProgramContext programContext) { - ProgramContext ctx = (raw.compiler.rql2.ProgramContext) programContext; + com.rawlabs.snapi.frontend.base.ProgramContext programContext) { + ProgramContext ctx = (com.rawlabs.snapi.frontend.rql2.ProgramContext) programContext; Tree tree = new Tree(program, true, ctx); SnapiTruffleEmitter emitter = new SnapiTruffleEmitter(tree, language, ctx); Rql2Program prog = (Rql2Program) tree.root(); diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleEntrypoint.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEntrypoint.java similarity index 89% rename from snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleEntrypoint.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEntrypoint.java index 6c73c3ab9..713037c64 100644 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/TruffleEntrypoint.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEntrypoint.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.compiler.snapi.truffle.compiler; +package com.rawlabs.snapi.truffle.emitter.compiler; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.nodes.RootNode; -import raw.client.api.Entrypoint; +import com.rawlabs.compiler.Entrypoint; public class TruffleEntrypoint implements Entrypoint { diff --git a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/CompilerScalaConsts.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CompilerScalaConsts.java similarity index 75% rename from snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/CompilerScalaConsts.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CompilerScalaConsts.java index b025dc49d..a2908577b 100644 --- a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/CompilerScalaConsts.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CompilerScalaConsts.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.compiler.rql2output.truffle.builtin; +package com.rawlabs.snapi.truffle.emitter.output; -import raw.compiler.rql2.source.Rql2IsNullableTypeProperty; -import raw.compiler.rql2.source.Rql2IsTryableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; public class CompilerScalaConsts { public static final Rql2IsTryableTypeProperty tryable = Rql2IsTryableTypeProperty.apply(); diff --git a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/CsvWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CsvWriter.java similarity index 85% rename from snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/CsvWriter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CsvWriter.java index e31c2ad1d..95ab9df44 100644 --- a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/CsvWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CsvWriter.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.compiler.rql2output.truffle.builtin; +package com.rawlabs.snapi.truffle.emitter.output; import com.oracle.truffle.api.frame.FrameDescriptor; import java.util.Arrays; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.csv.writer.internal.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; public class CsvWriter { diff --git a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/JsonWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/JsonWriter.java similarity index 85% rename from snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/JsonWriter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/JsonWriter.java index 74faf67e3..c9bf3f44e 100644 --- a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/JsonWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/JsonWriter.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.compiler.rql2output.truffle.builtin; +package com.rawlabs.snapi.truffle.emitter.output; import com.oracle.truffle.api.frame.FrameDescriptor; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.json.writer.internal.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; import scala.collection.JavaConverters; -import static raw.compiler.rql2output.truffle.builtin.CompilerScalaConsts.nullable; -import static raw.compiler.rql2output.truffle.builtin.CompilerScalaConsts.tryable; +import static com.rawlabs.snapi.truffle.emitter.output.CompilerScalaConsts.nullable; +import static com.rawlabs.snapi.truffle.emitter.output.CompilerScalaConsts.tryable; public class JsonWriter { diff --git a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/TruffleBinaryWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/TruffleBinaryWriter.java similarity index 79% rename from snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/TruffleBinaryWriter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/TruffleBinaryWriter.java index bae3a6d5a..c098a5f0d 100644 --- a/snapi-truffle/src/main/java/raw/compiler/rql2output/truffle/builtin/TruffleBinaryWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/TruffleBinaryWriter.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.compiler.rql2output.truffle.builtin; +package com.rawlabs.snapi.truffle.emitter.output; import com.oracle.truffle.api.frame.FrameDescriptor; -import raw.compiler.rql2.source.Rql2BinaryType; -import raw.compiler.rql2.source.Rql2IsNullableTypeProperty; -import raw.compiler.rql2.source.Rql2IsTryableTypeProperty; -import raw.compiler.rql2.source.Rql2StringType; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.binary.BinaryBytesWriterNode; -import raw.runtime.truffle.ast.io.binary.NullableBinaryWriterNode; -import raw.runtime.truffle.ast.io.binary.TryableBinaryWriterNode; +import com.rawlabs.snapi.frontend.rql2.source.Rql2BinaryType; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2StringType; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.binary.BinaryBytesWriterNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.binary.NullableBinaryWriterNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.binary.TryableBinaryWriterNode; public class TruffleBinaryWriter { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ExpressionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ExpressionNode.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ExpressionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ExpressionNode.java index cfb1332ef..50a648874 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ExpressionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ExpressionNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.frame.VirtualFrame; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.instrumentation.StandardTags; import com.oracle.truffle.api.instrumentation.Tag; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.runtime.record.DuplicateKeyRecord; -import raw.runtime.truffle.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; @TypeSystemReference(RawTypes.class) @GenerateWrapper diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/PropertyType.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/PropertyType.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/PropertyType.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/PropertyType.java index 6c7843187..0a7f517f0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/PropertyType.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/PropertyType.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; // Static properties for dynamic object storage types public class PropertyType { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/RawContext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawContext.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/RawContext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawContext.java index 703329409..bcda485d2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/RawContext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawContext.java @@ -10,22 +10,23 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.TruffleLanguage.Env; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.compiler.ProgramEnvironment; +import com.rawlabs.compiler.ProgramEnvironment$; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.snapi.frontend.inferrer.api.InferrerService; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.function.RawFunctionRegistry; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.core.RawUid; import java.io.OutputStream; import java.util.Set; -import raw.client.api.*; -import raw.inferrer.api.InferrerService; -import raw.protocol.LocationConfig; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.function.RawFunctionRegistry; -import raw.utils.RawSettings; -import raw.utils.RawUid; import scala.collection.JavaConverters; public final class RawContext { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/RawLanguage.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguage.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/RawLanguage.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguage.java index 61e3bb49e..a0d681eb3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/RawLanguage.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguage.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives; @@ -24,27 +24,27 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.object.Shape; +import com.rawlabs.compiler.Entrypoint; +import com.rawlabs.snapi.frontend.base.CompilerContext; +import com.rawlabs.snapi.frontend.base.InitPhase; +import com.rawlabs.snapi.frontend.base.Phase; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.common.PhaseDescriptor; +import com.rawlabs.snapi.frontend.common.source.SourceProgram; +import com.rawlabs.snapi.frontend.inferrer.api.InferrerService; +import com.rawlabs.snapi.frontend.rql2.*; +import com.rawlabs.snapi.frontend.rql2.source.InternalSourcePrettyPrinter; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Program; +import com.rawlabs.snapi.truffle.emitter.compiler.TruffleEmit; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleValidationException; +import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.core.RawUid; import com.typesafe.config.ConfigFactory; import java.util.*; import java.util.stream.Collectors; import org.graalvm.options.OptionDescriptors; -import raw.client.api.*; -import raw.compiler.base.CompilerContext; -import raw.compiler.base.InitPhase; -import raw.compiler.base.Phase; -import raw.compiler.base.source.Type; -import raw.compiler.common.PhaseDescriptor; -import raw.compiler.common.source.SourceProgram; -import raw.compiler.rql2.*; -import raw.compiler.rql2.source.InternalSourcePrettyPrinter; -import raw.compiler.rql2.source.Rql2Program; -import raw.compiler.snapi.truffle.compiler.TruffleEmit; -import raw.inferrer.api.InferrerService; -import raw.runtime.truffle.runtime.exceptions.RawTruffleValidationException; -import raw.runtime.truffle.runtime.record.DuplicateKeyRecord; -import raw.runtime.truffle.runtime.record.PureRecord; -import raw.utils.RawSettings; -import raw.utils.RawUid; import scala.collection.JavaConverters; @TruffleLanguage.Registration( @@ -174,23 +174,23 @@ protected CallTarget parse(ParsingRequest request) throws Exception { Arrays.asList( new PhaseDescriptor( "SugarExtensionDesugarer", - (Class>) + (Class>) (Class) SugarExtensionDesugarer.class), new PhaseDescriptor( "(Sugar)SugarExtensionDesugarer", - (Class>) + (Class>) (Class) SugarExtensionDesugarer.class), new PhaseDescriptor( "ListProjDesugarer", - (Class>) + (Class>) (Class) ListProjDesugarer.class), new PhaseDescriptor( "Propagation", - (Class>) + (Class>) (Class) Propagation.class), new PhaseDescriptor( "ImplicitCasts", - (Class>) + (Class>) (Class) ImplicitCasts.class)); @CompilerDirectives.TruffleBoundary diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/RawLanguageCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguageCache.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/RawLanguageCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguageCache.java index 44861a4e3..95d618ddc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/RawLanguageCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguageCache.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import com.oracle.truffle.api.CompilerDirectives; +import com.rawlabs.snapi.frontend.base.CompilerContext; +import com.rawlabs.snapi.frontend.inferrer.api.InferrerService; +import com.rawlabs.snapi.frontend.inferrer.api.InferrerServiceProvider; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.core.RawUid; +import com.rawlabs.utils.core.RawUtils; import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import raw.compiler.base.CompilerContext; -import raw.inferrer.api.InferrerService; -import raw.inferrer.api.InferrerServiceProvider; -import raw.utils.RawSettings; -import raw.utils.RawUid; -import raw.utils.RawUtils; import scala.runtime.BoxedUnit; public class RawLanguageCache { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/RawOptions.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawOptions.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/RawOptions.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawOptions.java index 4f01ab455..4f3c8494a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/RawOptions.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawOptions.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import org.graalvm.options.OptionDescriptor; import org.graalvm.options.OptionDescriptors; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/RawTypes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawTypes.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/RawTypes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawTypes.java index 53ffb5429..ade6ea4de 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/RawTypes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawTypes.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import com.oracle.truffle.api.dsl.TypeSystem; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.runtime.record.DuplicateKeyRecord; -import raw.runtime.truffle.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; @TypeSystem({ boolean.class, diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/StatementNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/StatementNode.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/StatementNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/StatementNode.java index 46315cce4..3688006e9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/StatementNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/StatementNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle; +package com.rawlabs.snapi.truffle.runtime; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrumentation.*; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/BinaryNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/BinaryNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/BinaryNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/BinaryNode.java index d1e52783a..d1d4c1ace 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/BinaryNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/BinaryNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast; +package com.rawlabs.snapi.truffle.runtime.ast; import com.oracle.truffle.api.dsl.NodeChild; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeChild("leftNode") @NodeChild("rightNode") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/ProgramExpressionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramExpressionNode.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/ProgramExpressionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramExpressionNode.java index 3a3566a62..866cc5834 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/ProgramExpressionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramExpressionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast; +package com.rawlabs.snapi.truffle.runtime.ast; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; public final class ProgramExpressionNode extends RootNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/ProgramStatementNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramStatementNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/ProgramStatementNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramStatementNode.java index 1163cfc99..a6a18a29c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/ProgramStatementNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramStatementNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast; +package com.rawlabs.snapi.truffle.runtime.ast; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.RootNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.StatementNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.StatementNode; public final class ProgramStatementNode extends RootNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/TypeGuards.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/TypeGuards.java similarity index 98% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/TypeGuards.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/TypeGuards.java index 04b4f9669..43a5a52f4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/TypeGuards.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/TypeGuards.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast; +package com.rawlabs.snapi.truffle.runtime.ast; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Idempotent; -import raw.compiler.rql2.source.*; +import com.rawlabs.snapi.frontend.rql2.source.*; public class TypeGuards { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/controlflow/ExpBlockNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/ExpBlockNode.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/controlflow/ExpBlockNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/ExpBlockNode.java index dca327953..03669c0c3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/controlflow/ExpBlockNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/ExpBlockNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.controlflow; +package com.rawlabs.snapi.truffle.runtime.ast.controlflow; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.BlockNode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.StatementNode; public final class ExpBlockNode extends ExpressionNode implements BlockNode.ElementExecutor { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/controlflow/IfThenElseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/IfThenElseNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/controlflow/IfThenElseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/IfThenElseNode.java index 525af28d4..4bb16f4ec 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/controlflow/IfThenElseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/IfThenElseNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.controlflow; +package com.rawlabs.snapi.truffle.runtime.ast.controlflow; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.profiles.CountingConditionProfile; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public final class IfThenElseNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregateMultipleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateMultipleNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregateMultipleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateMultipleNode.java index ce97dba9b..283a466a8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregateMultipleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateMultipleNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRMultiAggregationBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRMultiAggregationBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; public class AggregateMultipleNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregateSingleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateSingleNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregateSingleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateSingleNode.java index 7d1dacf77..837264c55 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregateSingleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateSingleNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRSingleAggregationBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRSingleAggregationBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; public class AggregateSingleNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/Aggregations.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/Aggregations.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/Aggregations.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/Aggregations.java index 816988a45..e7ff032e8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/Aggregations.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/Aggregations.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; public class Aggregations { public static final byte COUNT = 0; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregatorNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregatorNodes.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregatorNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregatorNodes.java index f7d77d5d6..efaab9d67 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/aggregation/AggregatorNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregatorNodes.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; public class AggregatorNodes { @NodeInfo(shortName = "Aggregator.Zero") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/AndNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/AndNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/AndNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/AndNode.java index 5e3492023..28238c529 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/AndNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/AndNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; public final class AndNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/DivNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/DivNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/DivNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/DivNode.java index 023e449e2..3ed9815d4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/DivNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/DivNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; @@ -18,9 +18,9 @@ import java.math.BigDecimal; import java.math.MathContext; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; // TODO: further optimization could be done by creating permutations of types? // if we divide 500.0 by 500.0 the result could fit into int, should we specialize that case? diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/EqNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/EqNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/EqNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/EqNode.java index 57b37ab49..786380128 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/EqNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/EqNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = "==") public class EqNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/GeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GeNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/GeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GeNode.java index ecddf1e95..ec6de24c0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/GeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; public class GeNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/GtNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GtNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/GtNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GtNode.java index 315e45788..c8f7d49c0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/GtNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GtNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = ">") public class GtNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/LeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LeNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/LeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LeNode.java index cb2d5f24b..0808287a8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/LeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; public class LeNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/LtNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LtNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/LtNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LtNode.java index 8403503bf..e96fe7fef 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/LtNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LtNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = "<") public class LtNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/ModNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/ModNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/ModNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/ModNode.java index 88efd7c8e..8de2fee0e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/ModNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/ModNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "%") public abstract class ModNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/MultNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/MultNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/MultNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/MultNode.java index 3346c2fbb..181e248e7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/MultNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/MultNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "*") public abstract class MultNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/OrNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/OrNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/OrNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/OrNode.java index 38d700a32..42f8af319 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/OrNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/OrNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; public final class OrNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/PlusNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/PlusNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/PlusNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/PlusNode.java index 541e409f3..f8ef33185 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/PlusNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/PlusNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = "+") public class PlusNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/SubNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/SubNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/SubNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/SubNode.java index 1ec0f4bee..5034a58d0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/binary/SubNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/SubNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.binary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ast.BinaryNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "-") public abstract class SubNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java index b3ebc310b..c30509618 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java @@ -10,13 +10,23 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.aws_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.aws_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; import java.net.HttpURLConnection; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -29,16 +39,6 @@ import java.time.format.DateTimeFormatter; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.sources.bytestream.http.HttpByteStreamLocation; -import raw.utils.RawSettings; import scala.None$; import scala.Option; import scala.Some; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryBase64Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryBase64Node.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryBase64Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryBase64Node.java index 0108329c0..75f2b28dd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryBase64Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryBase64Node.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.binary_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; import java.util.Base64; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "Binary.Base64") @NodeChild(value = "binary") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryFromStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryFromStringNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryFromStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryFromStringNode.java index d0b5255e6..329248683 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryFromStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryFromStringNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.binary_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; @NodeInfo(shortName = "Binary.FromString") @NodeChild(value = "binary") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryReadNode.java similarity index 66% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryReadNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryReadNode.java index 7dc8c73d0..290e9108b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/binary_package/BinaryReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryReadNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.binary_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; import java.io.IOException; import java.io.InputStream; import org.apache.commons.io.IOUtils; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.primitives.BinaryObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleInputStream; @NodeInfo(shortName = "Binary.Read") @NodeChild(value = "binary") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java index 75900a970..4cb5f5ea2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.environment_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; @@ -21,12 +21,12 @@ import com.oracle.truffle.api.library.CachedLibrary; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.primitives.*; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; @ImportStatic(value = {TypeGuards.class, StaticInitializers.class}) @NodeInfo(shortName = "Environment.Parameter") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java index 1d33619d6..5f41ee3f6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.environment_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Bind; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; @NodeInfo(shortName = "Environment.Scopes") @ImportStatic(StaticInitializers.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java similarity index 69% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java index 48b2c4c11..753396b53 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.environment_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Environment.Secret") @NodeChild(value = "key") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java index 5b556bf8b..b72d76660 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.function_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.function_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; @NodeInfo(shortName = "Function.InvokeAfter") @NodeChild(value = "function") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpReadNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpReadNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpReadNode.java index 69e20d6a2..67e9f41b2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpReadNode.java @@ -10,28 +10,28 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.http_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.utils.sources.api.LocationException; +import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; +import com.rawlabs.utils.sources.bytestream.http.HttpResult; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.BinaryObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.sources.api.LocationException; -import raw.sources.bytestream.http.HttpByteStreamLocation; -import raw.sources.bytestream.http.HttpResult; import scala.Tuple2; import scala.collection.IndexedSeq; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java index 14e40b437..4f6f23a87 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.http_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; -import raw.runtime.truffle.ExpressionNode; @NodeInfo(shortName = "Http.UrlDecode") @NodeChild(value = "str") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java index cd1e7e8c3..7623d02b6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.http_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import raw.runtime.truffle.ExpressionNode; @NodeInfo(shortName = "Http.UrlEncode") @NodeChild(value = "str") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/jdbc/JdbcQueryNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/jdbc/JdbcQueryNode.java index 5dabf997e..dc96e6ee9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/jdbc/JdbcQueryNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.jdbc; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; -import raw.runtime.truffle.runtime.iterable.sources.JdbcQueryCollection; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.JdbcQueryCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawSettings; @NodeInfo(shortName = "Jdbc.Query") public class JdbcQueryNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationDescribeNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationDescribeNode.java index bcfea1f40..68d6ca9f8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationDescribeNode.java @@ -10,30 +10,30 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.inferrer.api.*; +import com.rawlabs.snapi.frontend.rql2.Rql2TypeUtils$; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.utils.core.RawException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import raw.compiler.rql2.Rql2TypeUtils$; -import raw.compiler.rql2.source.*; -import raw.inferrer.api.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.utils.RawException; import scala.Some; // A.Z Similar implementation to Scala diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromHttpNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromHttpNode.java index f002b608c..8306401ce 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromHttpNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.InteropLibrary; @@ -18,19 +18,19 @@ import com.oracle.truffle.api.interop.UnknownIdentifierException; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.protocol.compiler.HttpHeadersConfig; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; import java.net.HttpURLConnection; import java.util.Base64; import java.util.Map; -import raw.protocol.HttpHeadersConfig; -import raw.protocol.LocationConfig; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.bytestream.http.HttpByteStreamLocation; -import raw.utils.RawSettings; import scala.None$; import scala.Option; import scala.Some; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java index 0c48ef2ee..5a6e66425 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.protocol.LocationConfig; -import raw.protocol.MySqlConfig; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.mysql.MySqlServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.protocol.compiler.MySqlConfig; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.mysql.MySqlServerLocation; @NodeInfo(shortName = "Location.FromMySQLCredential") public class LocationFromMySQLCredentialNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLNode.java index 3730c9e41..e3a84ffe0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.mysql.MySqlServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.mysql.MySqlServerLocation; @NodeInfo(shortName = "Location.FromMySQL") public class LocationFromMySQLNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java index 532a64f50..f3b6e2911 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.protocol.LocationConfig; -import raw.protocol.OracleConfig; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.oracle.OracleServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.protocol.compiler.OracleConfig; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.oracle.OracleServerLocation; @NodeInfo(shortName = "Location.FromOracleCredential") public class LocationFromOracleCredentialNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleNode.java index 0a60a6e96..938c8619e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.oracle.OracleServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.oracle.OracleServerLocation; @NodeInfo(shortName = "Location.FromOracle") public class LocationFromOracleNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java index dc729cd46..ce9a1f182 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.protocol.LocationConfig; -import raw.protocol.PostgreSQLConfig; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.pgsql.PostgresqlServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.protocol.compiler.PostgreSQLConfig; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.pgsql.PostgresqlServerLocation; @NodeInfo(shortName = "Location.FromPostgreSQLCredential") public class LocationFromPostgreSQLCredentialNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java index 45d8cc96a..b79f02a22 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.pgsql.PostgresqlServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.pgsql.PostgresqlServerLocation; @NodeInfo(shortName = "Location.FromPostgreSQL") public class LocationFromPostgreSQLNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromS3Node.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromS3Node.java index 62aa6eae4..09c2e0e5d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromS3Node.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.protocol.LocationConfig; -import raw.protocol.S3Config; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.filesystem.s3.S3Path; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.protocol.compiler.S3Config; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.sources.filesystem.s3.S3Path; import scala.None$; import scala.Option; import scala.Some; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java index be8c6a3d5..42d433b65 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.protocol.LocationConfig; -import raw.protocol.SQLServerConfig; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.sqlserver.SqlServerServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.protocol.compiler.SQLServerConfig; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.sqlserver.SqlServerServerLocation; @NodeInfo(shortName = "Location.FromSQLServerCredential") public class LocationFromSQLServerCredentialNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java index 0abcaa2b0..f338fc7aa 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.sqlserver.SqlServerServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.sqlserver.SqlServerServerLocation; @NodeInfo(shortName = "Location.FromSQLServer") public class LocationFromSQLServerNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java index c90cb81e2..f1335e384 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.protocol.LocationConfig; -import raw.protocol.SnowflakeConfig; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.snowflake.SnowflakeServerLocation; -import raw.utils.RawSettings; +import com.rawlabs.protocol.compiler.LocationConfig; +import com.rawlabs.protocol.compiler.SnowflakeConfig; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.snowflake.SnowflakeServerLocation; @NodeInfo(shortName = "Location.FromSnowflakeCredential") public class LocationFromSnowflakeCredentialNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java index a32228041..010c8ee86 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; @@ -19,17 +19,17 @@ import com.oracle.truffle.api.interop.UnknownIdentifierException; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; +import com.rawlabs.utils.sources.jdbc.snowflake.SnowflakeServerLocation; import java.util.HashMap; import java.util.Map; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; -import raw.runtime.truffle.runtime.primitives.*; -import raw.sources.jdbc.api.JdbcServerLocation; -import raw.sources.jdbc.snowflake.SnowflakeServerLocation; -import raw.utils.RawSettings; @NodeInfo(shortName = "Location.FromSnowflake") public class LocationFromSnowflakeNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromStringNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromStringNode.java index 199ec2ef9..280aed95f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromStringNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.api.LocationDescription$; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.sources.api.Location; +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.sources.api.Location; import scala.util.Either; @NodeInfo(shortName = "Location.FromString") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationLlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLlNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationLlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLlNode.java index 54aa24546..16a16be4f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationLlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLlNode.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.utils.core.RawException; +import com.rawlabs.utils.sources.filesystem.api.*; import java.time.LocalDateTime; import java.time.ZoneOffset; -import raw.compiler.rql2.api.LocationDescription$; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.list.StringList; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.sources.filesystem.api.*; -import raw.utils.RawException; import scala.Tuple2; import scala.collection.IndexedSeq; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationLsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLsNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationLsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLsNode.java index c3dde3c89..e12e9a175 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/location_package/LocationLsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLsNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.api.LocationDescription$; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.StringList; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.sources.filesystem.api.FileSystemLocation; -import raw.utils.RawException; +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawException; +import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation; import scala.collection.IndexedSeq; @NodeInfo(shortName = "String.Read") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAbsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAbsNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAbsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAbsNode.java index 1bcd3ff81..1e5530d9f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAbsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAbsNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; // TODO: A.Z make sure that the semantics are correct @NodeInfo(shortName = "Math.Abs") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAcosNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAcosNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAcosNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAcosNode.java index 5c812550a..7abd5cc05 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAcosNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAcosNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Acos") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAsinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAsinNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAsinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAsinNode.java index 9cdcea644..15cb1e396 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAsinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAsinNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; // TODO: Check Acos comments @NodeInfo(shortName = "Math.Asin") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAtanNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtanNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAtanNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtanNode.java index ed9190e2a..242d513ac 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAtanNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtanNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Atan") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAtn2Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtn2Node.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAtn2Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtn2Node.java index b65fb0cbe..a1d8a0ebd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathAtn2Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtn2Node.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Atn2") @NodeChild(value = "left", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCeilingNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCeilingNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCeilingNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCeilingNode.java index f09369d9e..7516f9bbe 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCeilingNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCeilingNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; import java.math.RoundingMode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "Math.Ceiling") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCosNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCosNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCosNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCosNode.java index ef0b3eaf0..04262683f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCosNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCosNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Cos") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCotNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCotNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCotNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCotNode.java index c9a4f5da4..f5382809c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathCotNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCotNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Cot") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathDegreesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathDegreesNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathDegreesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathDegreesNode.java index 9e002ede6..ec399a0e3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathDegreesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathDegreesNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Degrees") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathExpNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathExpNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathExpNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathExpNode.java index 1d5d119ba..095faff92 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathExpNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathExpNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Exp") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathFloorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathFloorNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathFloorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathFloorNode.java index 95f5865fd..e2db17ee9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathFloorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathFloorNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; import java.math.RoundingMode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "Math.Floor") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathLog10Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLog10Node.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathLog10Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLog10Node.java index 56e20047f..1c626749a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathLog10Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLog10Node.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Log10") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathLogNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLogNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathLogNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLogNode.java index 3687cdb34..41957e580 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathLogNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLogNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Log") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathPowerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathPowerNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathPowerNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathPowerNode.java index 8ef758165..d0f6bdef0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathPowerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathPowerNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Power") @NodeChild(value = "left", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathRadiansNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathRadiansNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathRadiansNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathRadiansNode.java index 019101a74..fec79683a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathRadiansNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathRadiansNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Radians") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSignNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSignNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSignNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSignNode.java index a0cc4cba3..508aa7a54 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSignNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSignNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Sign") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSinNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSinNode.java index ec882c618..107cd2106 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSinNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Sin") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSqrtNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSqrtNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSqrtNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSqrtNode.java index 07d10cb5d..d99eb4ae5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSqrtNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSqrtNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Sqrt") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSquareNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSquareNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSquareNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSquareNode.java index f75179848..af4b024f0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathSquareNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSquareNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Floor") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathTanNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathTanNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathTanNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathTanNode.java index 2fe0283b1..3c56b11d7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/math_package/MathTanNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathTanNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Math.Sin") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java index b507405f3..8149dd9ae 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.byte_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.byte_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Byte.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java index 40d32db5b..bfe804f3f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.decimal_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; import java.math.BigDecimal; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Decimal.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java index c8ca0bafe..62c4a2c34 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.decimal_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; import java.math.BigDecimal; import java.math.MathContext; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "Decimal.Round") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java index 287427e4c..a17f9d5e3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.double_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.double_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Double.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/float_package/FloatFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/float_package/FloatFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/float_package/FloatFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/float_package/FloatFromNode.java index 4412f1410..c3e9fcde9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/float_package/FloatFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/float_package/FloatFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.float_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Float.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/int_package/IntFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntFromNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/int_package/IntFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntFromNode.java index febb4f8d2..2ca3c2b4d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/int_package/IntFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntFromNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.int_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package; -import static raw.runtime.truffle.boundary.RawTruffleBoundaries.parseInt; +import static com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries.parseInt; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.boundary.RawTruffleBoundaries; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Int.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/int_package/IntRangeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntRangeNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/int_package/IntRangeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntRangeNode.java index 6e82690a0..369506d0f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/int_package/IntRangeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntRangeNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.int_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.iterable.sources.IntRangeCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.IntRangeCollection; @NodeInfo(shortName = "Int.Range") @NodeChild(value = "start") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/long_package/LongFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/long_package/LongFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongFromNode.java index eb0f623a4..f4fdaf420 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/long_package/LongFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.long_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Long.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/long_package/LongRangeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongRangeNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/long_package/LongRangeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongRangeNode.java index a4ac6da0c..5c4ef03cf 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/long_package/LongRangeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongRangeNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.long_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.iterable.sources.LongRangeCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.LongRangeCollection; @NodeInfo(shortName = "Int.Range") @NodeChild(value = "start") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/short_package/ShortFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/short_package/ShortFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/short_package/ShortFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/short_package/ShortFromNode.java index 04a67c28f..07140dbbb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/numeric/short_package/ShortFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/short_package/ShortFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.numeric.short_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.short_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Short.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexCache.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexCache.java index 8d23df2bd..fe06b0ee4 100755 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexCache.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import java.util.HashMap; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java index da243e224..9028726cf 100755 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Regex.FirstMatchIn") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexGroupsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexGroupsNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexGroupsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexGroupsNode.java index 360e97c2a..ea59e4a96 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexGroupsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexGroupsNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Regex.FirstMatchIn") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexMatchesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexMatchesNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexMatchesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexMatchesNode.java index 1326fe770..87332ce86 100755 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexMatchesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexMatchesNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Regex.Matches") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexReplaceNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexReplaceNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexReplaceNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexReplaceNode.java index f04ea7fa3..7d657daf3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/regex_package/RegexReplaceNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexReplaceNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Regex.Replace") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringBase64Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringBase64Node.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringBase64Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringBase64Node.java index 65f11ca4e..fa4c919b2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringBase64Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringBase64Node.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.util.Base64; -import raw.runtime.truffle.ExpressionNode; @NodeInfo(shortName = "String.Base64") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringCapitalizeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCapitalizeNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringCapitalizeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCapitalizeNode.java index 60ca147ca..d4e3306bc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringCapitalizeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCapitalizeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Capitalize") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringContainsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringContainsNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringContainsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringContainsNode.java index 8d66064d9..a298ddab8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringContainsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringContainsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Contains") @NodeChild(value = "s1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringCountSubStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCountSubStringNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringCountSubStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCountSubStringNode.java index dc9811b4d..f8b361aab 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringCountSubStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCountSubStringNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.CountSubString") @NodeChild(value = "string1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringDecodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringDecodeNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringDecodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringDecodeNode.java index 18cfe7965..16e6a9469 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringDecodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringDecodeNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.utils.sources.api.Encoding; import java.nio.charset.Charset; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.BinaryObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.sources.api.Encoding; @NodeInfo(shortName = "String.Decode") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringEmptyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEmptyNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringEmptyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEmptyNode.java index 0afd588f8..bcfe9526f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringEmptyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEmptyNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Empty") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringEncodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEncodeNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringEncodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEncodeNode.java index 330aab5d7..6e82197d4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringEncodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEncodeNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.utils.sources.api.Encoding; import java.nio.charset.Charset; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.BinaryObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.sources.api.Encoding; @NodeInfo(shortName = "String.Encode") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringFromNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringFromNode.java index 109ac4b40..5af943fea 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringFromNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; -import static raw.runtime.truffle.runtime.primitives.TruffleTemporalFormatter.*; +import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.*; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; @NodeInfo(shortName = "String.From") @NodeChild(value = "value") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLTrimNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLTrimNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLTrimNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLTrimNode.java index 8a90dad9e..e8ca50f6f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLTrimNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLTrimNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.LTrim") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLengthNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLengthNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLengthNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLengthNode.java index d2a18d08b..df0ec9730 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLengthNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLengthNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Length") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java index 579d1860a..7e89bae65 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.util.Arrays; -import raw.runtime.truffle.ExpressionNode; @NodeInfo(shortName = "String.LevenshteinDistance") @NodeChild(value = "string1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLowerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLowerNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLowerNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLowerNode.java index e806f44d7..66fc97553 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringLowerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLowerNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Lower") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringRTrimNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringRTrimNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringRTrimNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringRTrimNode.java index 0b6516083..ea138ff23 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringRTrimNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringRTrimNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.RTrim") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReadLinesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadLinesNode.java similarity index 64% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReadLinesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadLinesNode.java index 8daacf9c6..04e000bfb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReadLinesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadLinesNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.iterable.sources.ReadLinesCollection; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleCharInputStream; -import raw.runtime.truffle.utils.TruffleInputStream; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.ReadLinesCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; @NodeInfo(shortName = "String.ReadLines") @NodeChild("location") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReadNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadNode.java index 53477f84e..7bf5a5cb4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; import java.io.IOException; import java.io.Reader; import org.apache.commons.io.IOUtils; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleInputStream; @NodeInfo(shortName = "String.Read") @NodeChild("location") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReplaceNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplaceNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReplaceNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplaceNode.java index 9453ac9f5..64cb0b300 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReplaceNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplaceNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Replace") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReplicateNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplicateNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReplicateNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplicateNode.java index 767f4aed1..af6808a99 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReplicateNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplicateNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Replicate") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReverseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReverseNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReverseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReverseNode.java index a72b6b66b..903b876d3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringReverseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReverseNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Reverse") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringSplitNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSplitNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringSplitNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSplitNode.java index 859c63335..7ba9a92cd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringSplitNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSplitNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.regex.Pattern; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.StringList; @NodeInfo(shortName = "String.Split") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringStartsWithNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringStartsWithNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringStartsWithNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringStartsWithNode.java index d8e5250f1..954ab6570 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringStartsWithNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringStartsWithNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.StartsWith") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringSubStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSubStringNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringSubStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSubStringNode.java index 3fe208873..0883bf7d3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringSubStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSubStringNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; @NodeInfo(shortName = "String.SubString") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringTrimNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringTrimNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringTrimNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringTrimNode.java index 3121a98f7..8c2af90c9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringTrimNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringTrimNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Trim") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringUpperNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringUpperNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringUpperNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringUpperNode.java index 672712717..1d301d660 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/string_package/StringUpperNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringUpperNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "String.Upper") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/DateTimeFormatCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/DateTimeFormatCache.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/DateTimeFormatCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/DateTimeFormatCache.java index 3a226704e..eb962d4ca 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/DateTimeFormatCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/DateTimeFormatCache.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import java.time.format.DateTimeFormatter; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java index e9fd4dc48..3665a9724 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Date.AddInterval") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateBuildNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateBuildNode.java index a24ede5c4..f56246f82 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateBuildNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; import java.time.DateTimeException; import java.time.LocalDate; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Date.Build") @NodeChild("y") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateDayNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateDayNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateDayNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateDayNode.java index 7c9b3bbcc..556ef0592 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateDayNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateDayNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Day") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java index 234bf8372..ee28f921e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; import java.time.LocalDate; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.FromEpochDay") @NodeChild("d") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java index 52591364c..548f0d4b2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Date.FromTimestamp") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateMonthNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateMonthNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateMonthNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateMonthNode.java index 4f64dabea..648b299c4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateMonthNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateMonthNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Month") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateNowNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateNowNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateNowNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateNowNode.java index f6e43ed07..ba6ea1078 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateNowNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateNowNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; import java.time.LocalDate; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Now") public abstract class DateNowNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateParseNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateParseNode.java index 6dc1942b2..8e09dd91c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateParseNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Date.Parse") @NodeChild("str") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java index c21bde2f1..99c6eb528 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Date.SubtractInterval") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java index 23673eaf4..1e382b138 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; import java.time.LocalDate; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Date.Subtract") @NodeChild("date1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateYearNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateYearNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateYearNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateYearNode.java index 5d9ccc985..850812dd8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/date_package/DateYearNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateYearNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Year") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java index 284caef6a..cc262c9ea 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Build") @NodeChild("y") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java index f0d091393..b373dd542 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Days") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java index 7056e6883..6053b169e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.FromMillis") @NodeChild("millis") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java index 7dabe8085..c47746e16 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Hours") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java index ed7627777..423ffcce5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Millis") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java index d10595247..ada5c3da1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Minutes") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java index 117e412d7..ba302e4c8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Months") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java index d2f312846..8cee73c52 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; import java.time.Duration; import java.util.regex.Matcher; import java.util.regex.Pattern; -import raw.runtime.truffle.boundary.RawTruffleBoundaries; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.IntervalObject; public class IntervalNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java index 867f22ebb..258eafb0e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; -import static raw.runtime.truffle.boundary.RawTruffleBoundaries.parseInt; +import static com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries.parseInt; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; import java.text.ParseException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.boundary.RawTruffleBoundaries; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Parse") @NodeChild("format") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java index 52da39261..7f3beef08 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Seconds") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java index 1d4732b65..580241373 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.ToMillis") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java index 0c0452e0a..0216f740c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Weeks") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java index a8a69e312..e7b2ef40d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Years") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java index 956803231..c5372248b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.time.LocalTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Date.AddInterval") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java index b5d663cc9..62b2d57ab 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.time.DateTimeException; import java.time.LocalTime; import java.util.concurrent.TimeUnit; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Build") @NodeChild("h") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeHourNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeHourNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeHourNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeHourNode.java index 3b5ed5048..3cbd7562c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeHourNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeHourNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Hour") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java index c0f521b72..b09c45990 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.util.concurrent.TimeUnit; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Millis") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java index 78cc3352a..8d01da730 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Minute") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeNowNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeNowNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeNowNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeNowNode.java index 0c6518cb5..61a046e04 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeNowNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeNowNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.time.LocalTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Now") public abstract class TimeNowNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeParseNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeParseNode.java index 96f7de4e4..e8f1f81c5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeParseNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Parse") @NodeChild("str") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java index b9037dfa7..d8f4720d5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Second") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java index ca500d6eb..2576ac37a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.time.LocalTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Date.AddInterval") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java index c83fee920..ac1890144 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.time.LocalTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Subtract") @NodeChild("time1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java index 612168fd6..e429d8d89 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Subtract") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java index f1d22cc77..78172b4a3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.DateTimeException; import java.time.LocalDateTime; import java.util.concurrent.TimeUnit; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Build") @NodeChild("y") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java index f365d9ff9..d182f33fd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Day") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java index 7cd3aaeb0..11601dbf4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.FromDate") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java index 9db73b9a2..4bc97818a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.FromUnixTimestamp") @NodeChild("epoch") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java index 128e08a74..6a8c4284e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Hour") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java index 3609f458b..caed46b40 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.util.concurrent.TimeUnit; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Millis") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java index c661728a9..f64e4abb6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Minute") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java index e68e1bc4a..6886781da 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Month") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java index 68dc1b8ef..e6bf6147f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Now") public abstract class TimestampNowNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java index 4a0b0f65a..c4be33d27 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Parse") @NodeChild("str") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java similarity index 67% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java index 12de774a2..5a2e65511 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.iterable.sources.TimestampRangeCollection; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.TimestampRangeCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Range") @NodeChild("start") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java index c77d39d27..a619383d2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Second") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java index d2da77bba..098823a89 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Subtract") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java index 7fc762ac3..a97889cc4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDateTime; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Subtract") @NodeChild("timestamp1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java index 473f3ee23..107c18ee2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZoneOffset; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.TimeBucketInterval") @NodeChild("value") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java index f842370d0..76ef75633 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.DayOfWeek; import java.time.LocalDateTime; import java.time.temporal.TemporalAdjusters; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.TimeBucketString") @NodeChild("value") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java index 5b5ab83de..e576342b9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.ZoneId; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.ToUnixTimestamp") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java index 30c4337bd..cba8dbcb6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Year") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeMatchNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeMatchNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeMatchNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeMatchNode.java index 764e96f90..df226aa72 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeMatchNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeMatchNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.type_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.or.OrObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; public class TypeMatchNode extends ExpressionNode { @Child private ExpressionNode typeExp; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java index 35446b53b..e9dac1a0f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.type_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleUnexpectedNullException; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleUnexpectedNullException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; public final class TypeProtectCastOptionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java index c017a3741..a36534750 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.builtin.type_package; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; public final class TypeProtectCastTryableNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/ClosureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/ClosureNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/ClosureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/ClosureNode.java index f02b8c170..4b6908f97 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/ClosureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/ClosureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.function; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.Closure; -import raw.runtime.truffle.runtime.function.Function; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Closure; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; public class ClosureNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/InvokeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNode.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/InvokeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNode.java index b91a12bad..2ec5bee03 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/InvokeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.function; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; @@ -18,7 +18,7 @@ import com.oracle.truffle.api.instrumentation.Tag; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "InvokeWithNames") public final class InvokeNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/InvokeNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNodes.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/InvokeNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNodes.java index c32a42a92..3dd77247b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/InvokeNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNodes.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.function; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.Lambda; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Lambda; // A proxy node that dispatches to the correct execute method of a function runtime object. public class InvokeNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/MethodNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/MethodNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/MethodNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/MethodNode.java index f34cdb941..0fcf07f17 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/MethodNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/MethodNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.function; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Closure; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Lambda; +import com.rawlabs.snapi.truffle.runtime.runtime.function.RawFunctionRegistry; import java.util.Arrays; import java.util.Objects; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.function.Closure; -import raw.runtime.truffle.runtime.function.Function; -import raw.runtime.truffle.runtime.function.Lambda; -import raw.runtime.truffle.runtime.function.RawFunctionRegistry; public final class MethodNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/RecClosureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/RecClosureNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/RecClosureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/RecClosureNode.java index 91149949e..ac2dc549a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/function/RecClosureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/RecClosureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.function; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.Function; -import raw.runtime.truffle.runtime.function.RecClosure; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; +import com.rawlabs.snapi.truffle.runtime.runtime.function.RecClosure; public class RecClosureNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/ArrayOperationNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/ArrayOperationNodes.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/ArrayOperationNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/ArrayOperationNodes.java index 6e0e99a82..fc20911a5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/ArrayOperationNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/ArrayOperationNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable; import com.oracle.truffle.api.dsl.GenerateInline; import com.oracle.truffle.api.dsl.GenerateUncached; @@ -18,11 +18,11 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.list.*; public class ArrayOperationNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionBuildNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionBuildNode.java index f35d4e772..0c6e702b2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionBuildNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.sources.ExpressionCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.ExpressionCollection; @NodeInfo(shortName = "Collection.Build") public class CollectionBuildNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionDistinctNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionDistinctNode.java index 28da731d1..72287b04b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionDistinctNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.DistinctCollection; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.DistinctCollection; @NodeInfo(shortName = "Collection.Distinct") @NodeChild("input") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionEquiJoinNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionEquiJoinNode.java index 84f28de8f..a172ee776 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionEquiJoinNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.EquiJoinCollection; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.EquiJoinCollection; @NodeInfo(shortName = "Collection.EquiJoin") public class CollectionEquiJoinNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionExistsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionExistsNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionExistsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionExistsNode.java index 2c5be4483..a543b617b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionExistsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionExistsNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRExistsBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRExistsConditionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRExistsBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRExistsConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Collection.Exists") public class CollectionExistsNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFilterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFilterNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFilterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFilterNode.java index 92cf904ca..97f56ef32 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFilterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFilterNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.FilterCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.FilterCollection; @NodeInfo(shortName = "Collection.Filter") public class CollectionFilterNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFirstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFirstNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFirstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFirstNode.java index 241e25821..f8f2b51ea 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFirstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFirstNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; @NodeInfo(shortName = "Collection.First") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFromNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFromNode.java index f1384aa68..bafe83a21 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFromNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; @NodeInfo(shortName = "Collection.From") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionGroupByNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionGroupByNode.java index d9f2de73e..9213818e5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionGroupByNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.GroupByCollection; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.GroupByCollection; @NodeInfo(shortName = "Collection.GroupBy") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionJoinNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionJoinNode.java index 3b36b7bcf..20a931242 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionJoinNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.iterable.operations.JoinCollection; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.JoinCollection; @NodeInfo(shortName = "Collection.Join") @NodeChild("left") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionMkStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionMkStringNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionMkStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionMkStringNode.java index 1a05b0477..9e722e485 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionMkStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionMkStringNode.java @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRCollectionMkStringBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRCollectionMkStringBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Collection.MkString") public class CollectionMkStringNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionOrderByNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionOrderByNode.java index 5dc76ab55..38f45621c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionOrderByNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.iterable.operations.OrderByCollection; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.OrderByCollection; @NodeInfo(shortName = "Collection.OrderBy") public class CollectionOrderByNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTakeNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTakeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTakeNode.java index b9b044cc2..9964d1116 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTakeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.TakeCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.TakeCollection; @NodeInfo(shortName = "Collection.Take") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTransformNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTransformNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTransformNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTransformNode.java index b51d0e640..8a511539a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTransformNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTransformNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.TransformCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.TransformCollection; @NodeInfo(shortName = "Collection.Transform") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTupleAvgNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTupleAvgNode.java index a3e9fe1df..a0a39aaf5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTupleAvgNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.*; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.math.BigDecimal; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.aggregation.*; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "Collection.TupleAvg") public class CollectionTupleAvgNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionUnionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnionNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionUnionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnionNode.java index 6a316a928..460d2706a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionUnionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.sources.UnionCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.UnionCollection; @NodeInfo(shortName = "Collection.Union") public class CollectionUnionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionUnnestNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnnestNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionUnnestNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnnestNode.java index 9480a1093..2813f8959 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionUnnestNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnnestNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.iterable.operations.UnnestCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.UnnestCollection; @NodeInfo(shortName = "Collection.Unnest") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionZipNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionZipNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionZipNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionZipNode.java index 10d85f177..3c1344430 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/collection/CollectionZipNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionZipNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.iterable.operations.ZipCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.ZipCollection; @NodeInfo(shortName = "Collection.Zip") @NodeChild("parent1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListBuildNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListBuildNode.java index 2653d3016..dc038b14c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListBuildNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.list.*; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; @NodeInfo(shortName = "List.Build") public class ListBuildNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListCountNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListCountNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListCountNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListCountNode.java index 80159b68c..56d78ea95 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListCountNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListCountNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; @NodeInfo(shortName = "List.Count") @NodeChild("list") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListExistsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListExistsNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListExistsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListExistsNode.java index e16a3c277..a1016b216 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListExistsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListExistsNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRExistsBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRExistsConditionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRExistsBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRExistsConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; @NodeInfo(shortName = "List.Exists") public class ListExistsNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFilterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFilterNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFilterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFilterNode.java index 5f4d632d9..ff7bda4fb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFilterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFilterNode.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFilterBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodes; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListFilterBodyNode; -import raw.runtime.truffle.ast.osr.bodies.OSRToArrayBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.list.*; @NodeInfo(shortName = "List.Filter") public class ListFilterNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFirstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFirstNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFirstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFirstNode.java index f97d385f8..badf3c34a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFirstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFirstNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; @ImportStatic(value = TypeGuards.class) @NodeInfo(shortName = "List.First") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromNode.java index 2f7e6ec82..bd49da9e4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromNode.java @@ -10,30 +10,30 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFromBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodes; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListFromBodyNode; -import raw.runtime.truffle.ast.osr.bodies.OSRToArrayBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.list.*; -import raw.runtime.truffle.runtime.primitives.ErrorObject; @ImportStatic(value = TypeGuards.class) public class ListFromNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFromUnsafe.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromUnsafe.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFromUnsafe.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromUnsafe.java index f9099861c..29415fc82 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListFromUnsafe.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromUnsafe.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFromBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodes; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListFromBodyNode; -import raw.runtime.truffle.ast.osr.bodies.OSRToArrayBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.list.*; @NodeInfo(shortName = "List.FromUnsafe") public class ListFromUnsafe extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListGetNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGetNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListGetNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGetNode.java index bd5e56cbc..59fc00588 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListGetNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGetNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "List.Get") @NodeChild("list") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListGroupByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGroupByNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListGroupByNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGroupByNode.java index fef79247a..f4118b1e1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListGroupByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGroupByNode.java @@ -10,32 +10,32 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; -import static raw.runtime.truffle.runtime.generator.collection.StaticInitializers.getContextValues; +import static com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers.getContextValues; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListEquiJoinInitBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFromBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.RawArrayList; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListEquiJoinInitBodyNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListFromBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; -import raw.runtime.truffle.runtime.list.RawArrayList; @NodeInfo(shortName = "List.GroupBy") public class ListGroupByNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListLastNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListLastNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListLastNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListLastNode.java index 19a0358e0..1d9e619d3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListLastNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListLastNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; @ImportStatic(value = TypeGuards.class) @NodeInfo(shortName = "List.Last") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListTakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTakeNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListTakeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTakeNode.java index 60d2afb9a..307a82f5f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListTakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTakeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.list.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; @ImportStatic(value = TypeGuards.class) @NodeInfo(shortName = "List.Take") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListTransformNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTransformNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListTransformNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTransformNode.java index 9a3898b9d..071674e3e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/iterable/list/ListTransformNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTransformNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodes; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListTransformBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import raw.runtime.truffle.runtime.list.*; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListTransformBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; @NodeInfo(shortName = "List.Transform") public class ListTransformNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/BinaryConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BinaryConstNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/BinaryConstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BinaryConstNode.java index cfd8228e7..d318f662c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/BinaryConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BinaryConstNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; public class BinaryConstNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/BoolNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BoolNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/BoolNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BoolNode.java index 0fa298bde..6e1f80f8e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/BoolNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BoolNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public final class BoolNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ByteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ByteNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ByteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ByteNode.java index 82170d465..83f4a9b41 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ByteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ByteNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class ByteNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/DecimalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DecimalNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/DecimalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DecimalNode.java index bb759aaa7..dcc9eead4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/DecimalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DecimalNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; import java.math.BigDecimal; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; public class DecimalNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/DoubleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DoubleNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/DoubleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DoubleNode.java index 1df471ba0..3d1768a29 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/DoubleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DoubleNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public final class DoubleNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/FloatNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/FloatNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/FloatNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/FloatNode.java index eb8ccd604..d97448b40 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/FloatNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/FloatNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class FloatNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/IntNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/IntNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/IntNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/IntNode.java index 05448be2c..268c79b6f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/IntNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/IntNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public final class IntNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/LocationConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LocationConstNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/LocationConstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LocationConstNode.java index f7eb0e8f0..b24f9407d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/LocationConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LocationConstNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.compiler.rql2.api.LocationDescription$; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.sources.api.Location; -import raw.utils.RawSettings; +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawSettings; +import com.rawlabs.utils.sources.api.Location; public class LocationConstNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/LongNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LongNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/LongNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LongNode.java index 8712d8195..cbaccc643 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/LongNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LongNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public final class LongNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ShortNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ShortNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ShortNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ShortNode.java index 69f5fd706..a586e94c6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ShortNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ShortNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class ShortNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/StringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/StringNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/StringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/StringNode.java index 3887cc2bd..54f2d2e6f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/StringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/StringNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public final class StringNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/UndefinedNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UndefinedNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/UndefinedNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UndefinedNode.java index 41c26bca9..d123efed9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/UndefinedNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UndefinedNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class UndefinedNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/UnitNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UnitNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/UnitNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UnitNode.java index 0ee24189f..f7de70ce7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/UnitNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UnitNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public final class UnitNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ZeroedConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ZeroedConstNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ZeroedConstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ZeroedConstNode.java index b40c825b8..534adbfca 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/literals/ZeroedConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ZeroedConstNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.literals; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class ZeroedConstNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionFlatMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionFlatMapNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionFlatMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionFlatMapNode.java index e117f49af..e62d2870a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionFlatMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionFlatMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; @NodeInfo(shortName = "Option.FlatMap") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionGetOrElseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionGetOrElseNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionGetOrElseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionGetOrElseNode.java index 3b5f71785..4a63bd375 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionGetOrElseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionGetOrElseNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; @NodeInfo(shortName = "Option.FlatMap") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionIsDefinedNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionIsDefinedNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionIsDefinedNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionIsDefinedNode.java index efdecdead..634084bb6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionIsDefinedNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionIsDefinedNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Option.IsDefined") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionMapNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionMapNode.java index cc88f766c..7155acb18 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; @NodeInfo(shortName = "Option.Map") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionNoneNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionNoneNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionNoneNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionNoneNode.java index a4d50a26f..79f055b28 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionNoneNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionNoneNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; @NodeInfo(shortName = "Option.None") public class OptionNoneNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionSomeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionSomeNode.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionSomeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionSomeNode.java index 94a4d0e3c..4c42881e5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionSomeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionSomeNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeChild("value") public abstract class OptionSomeNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionUnsafeGetNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionUnsafeGetNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionUnsafeGetNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionUnsafeGetNode.java index f683afa0b..5c1a4a436 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/option/OptionUnsafeGetNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionUnsafeGetNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.option; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleUnexpectedNullException; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleUnexpectedNullException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; @NodeInfo(shortName = "Option.UnsafeGet") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordAddFieldNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordAddFieldNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordAddFieldNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordAddFieldNode.java index fa3cd8c40..00ac029c3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordAddFieldNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordAddFieldNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; import java.util.ArrayList; import java.util.List; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.record.RecordNodes; @NodeInfo(shortName = "Record.AddField") @NodeChild("inRecordNode") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordBuildNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordBuildNode.java index 3e5854d36..25e7cfa93 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordBuildNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.util.List; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "Record.Build") public class RecordBuildNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordConcatNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordConcatNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordConcatNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordConcatNode.java index fc52bdd1a..fb706bbf3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordConcatNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordConcatNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; import java.util.ArrayList; import java.util.List; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.record.RecordNodes; @NodeInfo(shortName = "Record.Concat") @NodeChild("record1") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordFieldsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordFieldsNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordFieldsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordFieldsNode.java index 19cf2a9e6..d36262832 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordFieldsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordFieldsNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; import java.util.Arrays; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.list.StringList; -import raw.runtime.truffle.runtime.record.RecordNodes; @NodeInfo(shortName = "Record.Fields") @NodeChild("record") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordProjNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordProjNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordProjNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordProjNode.java index 29bceec24..e1f810b16 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordProjNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordProjNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; @NodeInfo(shortName = "Record.Project") @NodeChild("receiverNode") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordRemoveFieldNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordRemoveFieldNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordRemoveFieldNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordRemoveFieldNode.java index 82d9d0c87..f519f4e50 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordRemoveFieldNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordRemoveFieldNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; import java.util.ArrayList; import java.util.List; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.record.RecordNodes; @NodeInfo(shortName = "Record.RemoveField") @NodeChild("record") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordStaticInitializers.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordStaticInitializers.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordStaticInitializers.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordStaticInitializers.java index 47d7d293d..d3ebbe974 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/record/RecordStaticInitializers.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordStaticInitializers.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.record; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.util.ArrayList; import java.util.List; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; public class RecordStaticInitializers { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFailureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFailureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureNode.java index 5f1596c25..5a833d02d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFailureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Tryable.Failure") @NodeChild("message") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFailureWithTypeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureWithTypeNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFailureWithTypeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureWithTypeNode.java index b8e112e31..7399c4b06 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFailureWithTypeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureWithTypeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Tryable.FailureWithType") @NodeChild("message") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFlatMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFlatMapNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFlatMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFlatMapNode.java index 70b290001..6f6ec0034 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableFlatMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFlatMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; @NodeInfo(shortName = "Tryable.FlatMap") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableGetFailureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableGetFailureNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableGetFailureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableGetFailureNode.java index a38c477cd..9146d9f18 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableGetFailureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableGetFailureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Tryable.GetFailure") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableIsFailureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsFailureNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableIsFailureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsFailureNode.java index 171887725..725f9f659 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableIsFailureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsFailureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Tryable.isError") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableIsSuccessNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsSuccessNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableIsSuccessNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsSuccessNode.java index 4845fd0fc..49069228e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableIsSuccessNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsSuccessNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Tryable.isSuccess") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableMapNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableMapNode.java index 19f5fb11f..037b5be3c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; @NodeInfo(shortName = "Tryable.Map") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableNullableFlatMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableNullableFlatMapNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableNullableFlatMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableNullableFlatMapNode.java index 57f8ba452..e2719b484 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableNullableFlatMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableNullableFlatMapNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.tryable_nullable.Nullable; -import raw.runtime.truffle.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; @NodeInfo(shortName = "TryableNullable.FlatMap") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableSuccessNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableSuccessNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableSuccessNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableSuccessNode.java index afdd33f45..4ad06cd8d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableSuccessNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableSuccessNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Tryable.Success") @NodeChild("value") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableUnsafeGetNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableUnsafeGetNode.java similarity index 72% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableUnsafeGetNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableUnsafeGetNode.java index cfb8a5a53..03840c6e2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/tryable/TryableUnsafeGetNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableUnsafeGetNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.tryable_nullable.Tryable; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Try.UnsafeGet") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NegNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NegNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NegNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NegNode.java index 324592a08..0597f3850 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NegNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NegNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.unary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeChild("value") public abstract class NegNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NotNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NotNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNode.java index 7e0977246..cff94f287 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NotNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.unary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeChild("value") public abstract class NotNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NotNullNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNullNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NotNullNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNullNode.java index 635e4738b..d90dc90e4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/expressions/unary/NotNullNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNullNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.expressions.unary; +package com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeChild("value") public abstract class NotNullNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/BinaryBytesWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryBytesWriterNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/BinaryBytesWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryBytesWriterNode.java index e154e5620..536d22923 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/BinaryBytesWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryBytesWriterNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.binary; +package com.rawlabs.snapi.truffle.runtime.ast.io.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; import java.io.IOException; import java.io.OutputStream; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "Binary.BytesWrite") public class BinaryBytesWriterNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/BinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryWriterNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/BinaryWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryWriterNode.java index 105201258..af10ad88b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/BinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryWriterNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.binary; +package com.rawlabs.snapi.truffle.runtime.ast.io.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; import java.io.OutputStream; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; @NodeInfo(shortName = "Binary.Write") public class BinaryWriterNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/NullableBinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/NullableBinaryWriterNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/NullableBinaryWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/NullableBinaryWriterNode.java index 23daf7e88..d4c249cdb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/NullableBinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/NullableBinaryWriterNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.binary; +package com.rawlabs.snapi.truffle.runtime.ast.io.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; import java.io.OutputStream; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "Binary.NullableWrite") public class NullableBinaryWriterNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/TryableBinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/TryableBinaryWriterNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/TryableBinaryWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/TryableBinaryWriterNode.java index 270fd6fa1..9264dbd9d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/binary/TryableBinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/TryableBinaryWriterNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.binary; +package com.rawlabs.snapi.truffle.runtime.ast.io.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.binary.BinaryWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; import java.io.OutputStream; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.runtime.exceptions.binary.BinaryWriterRawTruffleException; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "Binary.TryableWrite") public class TryableBinaryWriterNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/CsvParserNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/CsvParserNodes.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/CsvParserNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/CsvParserNodes.java index 574ed4275..9b5938e74 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/CsvParserNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/CsvParserNodes.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader; import com.oracle.truffle.api.dsl.GenerateInline; import com.oracle.truffle.api.dsl.GenerateUncached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParser; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import raw.runtime.truffle.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; public class CsvParserNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/BoolParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/BoolParseCsvNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/BoolParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/BoolParseCsvNode.java index 869e2cc7e..d3e5c9c4c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/BoolParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/BoolParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "BoolParseCsv") public class BoolParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DateParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DateParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DateParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DateParseCsvNode.java index 2f1fa29bb..b1c28131e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DateParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DateParseCsvNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "DateParseCsv") public class DateParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DecimalParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DecimalParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DecimalParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DecimalParseCsvNode.java index 9f0659286..55344a62e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DecimalParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DecimalParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "DecimalParseCsv") public class DecimalParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DoubleParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DoubleParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DoubleParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DoubleParseCsvNode.java index 0fd2af082..07351980d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/DoubleParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DoubleParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "DoubleParseCsv") public class DoubleParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IntParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IntParseCsvNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IntParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IntParseCsvNode.java index cdcbcb5c8..2f0012712 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IntParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IntParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "IntParseCsv") public class IntParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IterableParseCsvFile.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvFile.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IterableParseCsvFile.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvFile.java index 50c015b75..7e1755002 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IterableParseCsvFile.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvFile.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvParserRawTruffleException; -import raw.runtime.truffle.runtime.iterable.sources.CsvCollection; -import raw.runtime.truffle.runtime.list.StringList; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.CsvCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "IterableParseCsvFile") public class IterableParseCsvFile extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IterableParseCsvString.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvString.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IterableParseCsvString.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvString.java index 0af75508f..97b2716ec 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/IterableParseCsvString.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvString.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvParserRawTruffleException; -import raw.runtime.truffle.runtime.iterable.sources.CsvFromStringCollection; -import raw.runtime.truffle.runtime.list.StringList; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.CsvFromStringCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "IterableParseCsvString") public class IterableParseCsvString extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/LongParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/LongParseCsvNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/LongParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/LongParseCsvNode.java index 9b3dafb0d..5d8022c26 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/LongParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/LongParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "IntParseCsv") public class LongParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java index f71537358..83896169f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionBoolParseCsv") public class OptionBoolParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionByteParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionByteParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionByteParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionByteParseCsvNode.java index cc0cebd37..884ebfbb0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionByteParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionByteParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionByteParseCsv") public class OptionByteParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDateParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDateParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDateParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDateParseCsvNode.java index e6ffd9a1f..a5283060e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDateParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDateParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionDateParseCsv") public class OptionDateParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java index eb98eac05..e70eb9446 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionDecimalParseCsv") public class OptionDecimalParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java index 7456a9a4c..e4c2e2168 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionDoubleParseCsv") public class OptionDoubleParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java index 70a93a0a3..0f686e588 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionFloatParseCsv") public class OptionFloatParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionIntParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionIntParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionIntParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionIntParseCsvNode.java index 72a9fe8ab..c4acdb15e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionIntParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionIntParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionIntParseCsv") public class OptionIntParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionLongParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionLongParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionLongParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionLongParseCsvNode.java index 56b1a5163..f668285c8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionLongParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionLongParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionLongParseCsv") public class OptionLongParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionShortParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionShortParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionShortParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionShortParseCsvNode.java index 590ffb550..c80cf8b6f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionShortParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionShortParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionShortParseCsv") public class OptionShortParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionStringParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionStringParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionStringParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionStringParseCsvNode.java index 9454583a7..5beeb911a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionStringParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionStringParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionStringParseCsv") public class OptionStringParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java index e3d56e120..2ea3982ab 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionTimeParseCsv") public class OptionTimeParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java index 027ff3053..59f060a36 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionTimestampParseCsv") public class OptionTimestampParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java index fc25ea681..b4b83a93c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "OptionUndefinedParseCsv") public class OptionUndefinedParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RawTruffleCsvParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RawTruffleCsvParser.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java index 993e68c54..9cd112a36 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RawTruffleCsvParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonToken; @@ -19,6 +19,15 @@ import com.fasterxml.jackson.dataformat.csv.CsvSchema; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLogger; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; import java.io.IOException; import java.io.Reader; import java.time.LocalDate; @@ -27,15 +36,6 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.Objects; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.exceptions.csv.CsvExpectedNothingException; -import raw.runtime.truffle.runtime.exceptions.csv.CsvParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.csv.CsvReaderRawTruffleException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.utils.RawTruffleCharStream; public class RawTruffleCsvParser { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java index 10f6c85f0..762326f61 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; public class RawTruffleCsvParserSettings { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RecordParseCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RecordParseCsvNode.java index 309bd2365..2d9537f90 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RecordParseCsvNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.util.Arrays; import java.util.List; -import raw.compiler.rql2.source.Rql2AttrType; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "RecordParseCsv") public class RecordParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/ShortParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/ShortParseCsvNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/ShortParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/ShortParseCsvNode.java index fee175942..0861de85f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/ShortParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/ShortParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "ShortParseCsv") public class ShortParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/StringParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/StringParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/StringParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/StringParseCsvNode.java index 8625af30d..1312db181 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/StringParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/StringParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "StringParseCsv") public class StringParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TimeParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimeParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TimeParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimeParseCsvNode.java index 099968cd5..ee90c73de 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TimeParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimeParseCsvNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeParseCsv") public class TimeParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TimestampParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimestampParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TimestampParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimestampParseCsvNode.java index 246eea80c..1d094985d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TimestampParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimestampParseCsvNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampParseCsv") public class TimestampParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TryableParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TryableParseCsvNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TryableParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TryableParseCsvNode.java index 0b9f93a5e..c64321993 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/TryableParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TryableParseCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvParserRawTruffleException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseCsv") public class TryableParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/UndefinedParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/UndefinedParseCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/UndefinedParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/UndefinedParseCsvNode.java index 3021d0054..a465226c4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/reader/parser/UndefinedParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/UndefinedParseCsvNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "UndefinedParseCsv") public class UndefinedParseCsvNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/CsvIterableWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvIterableWriterNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/CsvIterableWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvIterableWriterNode.java index 1cb18d016..949967016 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/CsvIterableWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvIterableWriterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer; import static com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING; @@ -22,16 +22,16 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; import java.io.IOException; import java.io.OutputStream; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; public class CsvIterableWriterNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/CsvListWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvListWriterNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/CsvListWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvListWriterNode.java index 165628db7..39c944908 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/CsvListWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvListWriterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer; import static com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING; @@ -22,15 +22,15 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; import java.io.IOException; import java.io.OutputStream; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; -import raw.runtime.truffle.runtime.list.ObjectList; public class CsvListWriterNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/BinaryWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BinaryWriteCsvNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/BinaryWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BinaryWriteCsvNode.java index f5b25cf10..aa05d3cb1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/BinaryWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BinaryWriteCsvNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; import java.io.IOException; import java.util.Base64; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "BinaryWriteCsv") public class BinaryWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/BoolWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BoolWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/BoolWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BoolWriteCsvNode.java index 1e0a54975..ee2c877e8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/BoolWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BoolWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "BoolWriteCsv") public class BoolWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/ByteWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ByteWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/ByteWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ByteWriteCsvNode.java index 6c2ed508c..9a6e72098 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/ByteWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ByteWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "ByteWriteCsv") public class ByteWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DateWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DateWriteCsvNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DateWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DateWriteCsvNode.java index 10c71974d..c795bc697 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DateWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DateWriteCsvNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; import java.io.IOException; import java.time.format.DateTimeFormatter; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "DateWriteCsv") public class DateWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DecimalWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DecimalWriteCsvNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DecimalWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DecimalWriteCsvNode.java index 61043f4c8..7c80557c7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DecimalWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DecimalWriteCsvNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalWriteCsv") public class DecimalWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DoubleWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DoubleWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DoubleWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DoubleWriteCsvNode.java index fa2a6a0b7..8fb666abf 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/DoubleWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DoubleWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "DoubleWriteCsv") public class DoubleWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/FloatWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/FloatWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/FloatWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/FloatWriteCsvNode.java index 893ef25d4..d9bbda182 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/FloatWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/FloatWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "FloatWriteCsv") public class FloatWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/IntWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/IntWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/IntWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/IntWriteCsvNode.java index a244799b5..89c3ba83f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/IntWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/IntWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "IntWriteCsv") public class IntWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/LongWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/LongWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/LongWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/LongWriteCsvNode.java index d9a2a7ab8..da3c13939 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/LongWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/LongWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "LongWriteCsv") public class LongWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/NullableWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/NullableWriteCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/NullableWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/NullableWriteCsvNode.java index 4af652d5e..a1c89b04a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/NullableWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/NullableWriteCsvNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "NullableWriteCsv") public class NullableWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/RecordWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/RecordWriteCsvNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/RecordWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/RecordWriteCsvNode.java index 991ec631e..20e7a23be 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/RecordWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/RecordWriteCsvNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; @@ -21,13 +21,13 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "RecordWriteCsv") public class RecordWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/ShortWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ShortWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/ShortWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ShortWriteCsvNode.java index 363b9e798..6022cb6ad 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/ShortWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ShortWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "ShortWriteCsv") public class ShortWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/StringWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/StringWriteCsvNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/StringWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/StringWriteCsvNode.java index 4a3ce615d..572944425 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/StringWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/StringWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; @NodeInfo(shortName = "StringWriteCsv") public class StringWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TimeWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimeWriteCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TimeWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimeWriteCsvNode.java index 6d635afaf..1e7c4f8e6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TimeWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimeWriteCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; import java.io.IOException; import java.time.LocalTime; import java.time.format.DateTimeFormatter; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeWriteCsv") public class TimeWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TimestampWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimestampWriteCsvNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TimestampWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimestampWriteCsvNode.java index 95f21c1ff..61708bb60 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TimestampWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimestampWriteCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampWriteCsv") public class TimestampWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TryableWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TryableWriteCsvNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TryableWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TryableWriteCsvNode.java index e76c28d4c..aa3dbaf30 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/csv/writer/internal/TryableWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TryableWriteCsvNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; import java.io.IOException; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.runtime.exceptions.csv.CsvWriterRawTruffleException; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "TryableWriteCsv") public class TryableWriteCsvNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/BinaryReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BinaryReadJdbcQuery.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/BinaryReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BinaryReadJdbcQuery.java index ef0c9bc5e..782c202f2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/BinaryReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BinaryReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; @NodeInfo(shortName = "Jdbc.BinaryRead") public class BinaryReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/BoolReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BoolReadJdbcQuery.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/BoolReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BoolReadJdbcQuery.java index 100cb4d5d..7e6e9f332 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/BoolReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BoolReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.BoolRead") public class BoolReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/ByteReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ByteReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/ByteReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ByteReadJdbcQuery.java index e1c766348..68dae1f8f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/ByteReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ByteReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.ByteRead") public class ByteReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DateReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DateReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DateReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DateReadJdbcQuery.java index ace38901c..22302cfb2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DateReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DateReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "Jdbc.DateRead") public class DateReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DecimalReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DecimalReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DecimalReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DecimalReadJdbcQuery.java index e12c47ac8..b6cfecbbf 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DecimalReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DecimalReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "Jdbc.DecimalRead") public class DecimalReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DoubleReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DoubleReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DoubleReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DoubleReadJdbcQuery.java index 6056973ee..7a425a645 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/DoubleReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DoubleReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.DoubleRead") public class DoubleReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/FloatReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/FloatReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/FloatReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/FloatReadJdbcQuery.java index 1f0fc803d..b2a993896 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/FloatReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/FloatReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.FloatRead") public class FloatReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/IntReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/IntReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/IntReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/IntReadJdbcQuery.java index f1b2df0ea..90dc81f99 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/IntReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/IntReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.IntRead") public class IntReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/JdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/JdbcQuery.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/JdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/JdbcQuery.java index fc86704d9..906933460 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/JdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/JdbcQuery.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.utils.core.RawException; +import com.rawlabs.utils.core.RawSettings; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; -import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcReaderRawTruffleException; -import raw.runtime.truffle.runtime.primitives.*; -import raw.utils.RawException; -import raw.utils.RawSettings; public class JdbcQuery { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/LongReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/LongReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/LongReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/LongReadJdbcQuery.java index 77e40a566..c67d56f70 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/LongReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/LongReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.LongRead") public class LongReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/NullableReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/NullableReadJdbcQuery.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/NullableReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/NullableReadJdbcQuery.java index fc165f786..9266ff7fd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/NullableReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/NullableReadJdbcQuery.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; @NodeInfo(shortName = "NullableReadJdbcQuery") public class NullableReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/RecordReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/RecordReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/RecordReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/RecordReadJdbcQuery.java index 6de9519b6..7be177cd3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/RecordReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/RecordReadJdbcQuery.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.util.Arrays; import java.util.List; -import raw.compiler.rql2.source.Rql2AttrType; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "Jdbc.RecordRead") public class RecordReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/ShortReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ShortReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/ShortReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ShortReadJdbcQuery.java index 8a1df5acc..10d622162 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/ShortReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ShortReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "Jdbc.ShortRead") public class ShortReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/StringReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/StringReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/StringReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/StringReadJdbcQuery.java index 0d58c02c6..7096821bd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/StringReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/StringReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "StringReadJdbcQuery") public class StringReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TimeReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimeReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TimeReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimeReadJdbcQuery.java index ec29a6d62..bf7309598 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TimeReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimeReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.DateRead") public class TimeReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TimestampReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimestampReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TimestampReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimestampReadJdbcQuery.java index 3ca0408d7..9319aafc1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TimestampReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimestampReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.DateRead") public class TimestampReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TryableReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TryableReadJdbcQuery.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TryableReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TryableReadJdbcQuery.java index a490f5c34..9287cc5ec 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/jdbc/TryableReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TryableReadJdbcQuery.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.jdbc; +package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableReadJdbcQuery") public class TryableReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParseNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParseNode.java index 74eae9d24..94f27e6f4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParseNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.exceptions.json.JsonReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; @NodeInfo(shortName = "ParseJson") @NodeChild(value = "str") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonParserNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParserNodes.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonParserNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParserNodes.java index 68c2c3869..bee8bc7a6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonParserNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParserNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; @@ -22,6 +22,18 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordStaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonUnexpectedTokenException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.RawArrayList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import java.io.IOException; import java.io.Reader; import java.math.BigDecimal; @@ -31,18 +43,6 @@ import java.time.format.DateTimeParseException; import java.util.ArrayList; import java.util.Base64; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.ast.expressions.record.RecordStaticInitializers; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.exceptions.json.JsonParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.json.JsonReaderRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.json.JsonUnexpectedTokenException; -import raw.runtime.truffle.runtime.list.RawArrayList; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.utils.TruffleCharInputStream; public final class JsonParserNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonPrintNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonPrintNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonPrintNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonPrintNode.java index 8a1d844d5..a17030dfa 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonPrintNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonPrintNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.RootCallTarget; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; import java.io.ByteArrayOutputStream; import java.io.IOException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; @NodeInfo(shortName = "PrintJson") @NodeChild(value = "result") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonReadCollectionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadCollectionNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonReadCollectionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadCollectionNode.java index d07d4a032..e03546d78 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonReadCollectionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadCollectionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.iterable.sources.JsonReadCollection; -import raw.runtime.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.JsonReadCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; @NodeInfo(shortName = "Json.ReadCollection") public class JsonReadCollectionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonReadValueNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadValueNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonReadValueNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadValueNode.java index 2ce938a4f..c30c889e0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/JsonReadValueNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadValueNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes.CloseJsonParserNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes.InitJsonParserNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes.NextTokenJsonParserNode; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleCharInputStream; -import raw.runtime.truffle.utils.TruffleInputStream; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.CloseJsonParserNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.InitJsonParserNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.NextTokenJsonParserNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; @NodeInfo(shortName = "Json.ReadArray") public class JsonReadValueNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/TryableTopLevelWrapper.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/TryableTopLevelWrapper.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/TryableTopLevelWrapper.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/TryableTopLevelWrapper.java index 512eed3f9..ee73a60a5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/TryableTopLevelWrapper.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/TryableTopLevelWrapper.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; // This node is a top level wrapper node that catches the Initialization of a child parser failures @NodeInfo(shortName = "TryableParseJsonWrapper") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/AnyParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/AnyParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/AnyParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/AnyParseJsonNode.java index 36a41998f..ef87b2e89 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/AnyParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/AnyParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "AnyParseJson") public abstract class AnyParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/BinaryParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BinaryParseJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/BinaryParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BinaryParseJsonNode.java index f96295a82..884f89205 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/BinaryParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BinaryParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; @NodeInfo(shortName = "BinaryParseJson") public abstract class BinaryParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/BooleanParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BooleanParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/BooleanParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BooleanParseJsonNode.java index ef036c304..91b1c5c22 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/BooleanParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BooleanParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "BooleanParseJson") public abstract class BooleanParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ByteParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ByteParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ByteParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ByteParseJsonNode.java index b4363ea00..a2cc27bba 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ByteParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ByteParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "ByteParseJson") public abstract class ByteParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/CheckNonNullJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/CheckNonNullJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/CheckNonNullJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/CheckNonNullJsonNode.java index ff842a180..5de24e4a4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/CheckNonNullJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/CheckNonNullJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; @NodeInfo(shortName = "CheckNonNullJson") public class CheckNonNullJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DateParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DateParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DateParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DateParseJsonNode.java index c87981919..de4fa1c4a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DateParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DateParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "DateParseJson") @NodeChild(value = "format") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DecimalParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DecimalParseJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DecimalParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DecimalParseJsonNode.java index 35c8792a2..80433bc6c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DecimalParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DecimalParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalParseJson") public abstract class DecimalParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DoubleParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DoubleParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DoubleParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DoubleParseJsonNode.java index cbd0dc14c..c24e64351 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/DoubleParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DoubleParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "DoubleParseJson") public abstract class DoubleParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/FloatParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/FloatParseJsonNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/FloatParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/FloatParseJsonNode.java index 19c77ac68..be1143db8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/FloatParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/FloatParseJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; public abstract class FloatParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IntParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IntParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntParseJsonNode.java index c6d1a4d72..f51682f63 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IntParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "IntParseJson") public abstract class IntParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IntervalParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntervalParseJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IntervalParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntervalParseJsonNode.java index 8548c42f2..b2ed2177f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IntervalParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntervalParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "IntervalParseJson") public abstract class IntervalParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IterableParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IterableParseJsonNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IterableParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IterableParseJsonNode.java index 4df846ddd..4102950e4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/IterableParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IterableParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; @NodeInfo(shortName = "IterableParseJson") public class IterableParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ListParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ListParseJsonNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ListParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ListParseJsonNode.java index c7819c879..2f47d560e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ListParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ListParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -19,20 +19,20 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListParseJsonBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRListParseJsonConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonUnexpectedTokenException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.*; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodes; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRListParseJsonBodyNode; -import raw.runtime.truffle.ast.osr.bodies.OSRToArrayBodyNode; -import raw.runtime.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import raw.runtime.truffle.ast.osr.conditions.OSRListParseJsonConditionNode; -import raw.runtime.truffle.runtime.exceptions.json.JsonUnexpectedTokenException; -import raw.runtime.truffle.runtime.list.*; @NodeInfo(shortName = "IterableParseJson") public class ListParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/LongParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/LongParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/LongParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/LongParseJsonNode.java index babe90b68..eabcc8d4b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/LongParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/LongParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "LongParseJson") public abstract class LongParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/NullableParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/NullableParseJsonNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/NullableParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/NullableParseJsonNode.java index 15c36997e..e64aa758f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/NullableParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/NullableParseJsonNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; -import raw.runtime.truffle.runtime.exceptions.json.JsonExpectedNothingException; -import raw.runtime.truffle.runtime.exceptions.json.JsonParserRawTruffleException; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; public class NullableParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/OrParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/OrParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/OrParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/OrParseJsonNode.java index c65c3ece5..3d3139d93 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/OrParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/OrParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -19,15 +19,15 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonOrTypeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; import java.io.IOException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.exceptions.json.JsonOrTypeException; -import raw.runtime.truffle.runtime.exceptions.json.JsonParserRawTruffleException; -import raw.runtime.truffle.runtime.or.OrObject; public class OrParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/RecordParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/RecordParseJsonNode.java index bd222dcc8..ad7610e38 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/RecordParseJsonNode.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; -import static raw.runtime.truffle.boundary.RawTruffleBoundaries.*; +import static com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -22,21 +22,21 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonRecordFieldNotFoundException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonUnexpectedTokenException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.util.BitSet; import java.util.LinkedHashMap; -import raw.compiler.rql2.source.Rql2IsNullableTypeProperty; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; -import raw.runtime.truffle.boundary.RawTruffleBoundaries; -import raw.runtime.truffle.runtime.exceptions.json.JsonRecordFieldNotFoundException; -import raw.runtime.truffle.runtime.exceptions.json.JsonUnexpectedTokenException; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "RecordParseJson") @ImportStatic(RawTruffleBoundaries.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ShortParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ShortParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ShortParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ShortParseJsonNode.java index faa534691..016aca249 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/ShortParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ShortParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "ShortParseJson") public abstract class ShortParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/StringParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/StringParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/StringParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/StringParseJsonNode.java index ff66d39e2..28b5017c6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/StringParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/StringParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "StringParseJson") public abstract class StringParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TimeParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimeParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TimeParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimeParseJsonNode.java index 774242d16..2c0db02a2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TimeParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimeParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeParseJson") @NodeChild(value = "format") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TimestampParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimestampParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TimestampParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimestampParseJsonNode.java index 1636e5ee2..6e0f0a1f0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TimestampParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimestampParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampParseJson") @NodeChild(value = "format") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TryableParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TryableParseJsonNode.java similarity index 70% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TryableParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TryableParseJsonNode.java index 9cd098b08..0b42fdf7d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/TryableParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TryableParseJsonNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; -import raw.runtime.truffle.runtime.exceptions.json.JsonParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.json.JsonReaderRawTruffleException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseJson") public class TryableParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/UndefinedParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/UndefinedParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/UndefinedParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/UndefinedParseJsonNode.java index f2c2e2b3f..d6bb6109b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/reader/parser/UndefinedParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/UndefinedParseJsonNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.json.JsonExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonExpectedNothingException; public class UndefinedParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/JsonWriteNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriteNodes.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/JsonWriteNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriteNodes.java index fc586b3da..8c1f643a3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/JsonWriteNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriteNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonFactory; @@ -21,19 +21,19 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; import java.io.IOException; import java.io.OutputStream; import java.time.LocalDateTime; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.util.Base64; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.exceptions.json.JsonWriterRawTruffleException; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.runtime.record.DuplicateKeyRecord; -import raw.runtime.truffle.runtime.record.PureRecord; -import raw.runtime.truffle.runtime.record.RecordNodes; public final class JsonWriteNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/JsonWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriterNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/JsonWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriterNode.java index 63971b783..0181ed817 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/JsonWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.RootCallTarget; @@ -22,12 +22,12 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; import java.io.IOException; import java.io.OutputStream; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; @NodeInfo(shortName = "Json.Write") @NodeChild(value = "value", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/AnyWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/AnyWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/AnyWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/AnyWriteJsonNode.java index e4b582c86..b541d9377 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/AnyWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/AnyWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "AnyWriteJson") public class AnyWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/BinaryWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BinaryWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/BinaryWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BinaryWriteJsonNode.java index 279aaf40f..d40e201a3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/BinaryWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BinaryWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; @NodeInfo(shortName = "BinaryWriteJson") public class BinaryWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/BooleanWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BooleanWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/BooleanWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BooleanWriteJsonNode.java index fc7018775..4c312602a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/BooleanWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BooleanWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "BooleanWriteJson") public class BooleanWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ByteWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ByteWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ByteWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ByteWriteJsonNode.java index 751bfb0b3..9f1f901fc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ByteWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ByteWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "ByteWriteJson") public class ByteWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DateWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DateWriteJsonNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DateWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DateWriteJsonNode.java index 88e24e121..ff1e617c2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DateWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DateWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "BooleanWriteJson") public class DateWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DecimalWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DecimalWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DecimalWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DecimalWriteJsonNode.java index b0c02b5b3..7c9f1433b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DecimalWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DecimalWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalWriteJson") public class DecimalWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DoubleWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DoubleWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DoubleWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DoubleWriteJsonNode.java index d9251aca8..bd963a376 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/DoubleWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DoubleWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "DoubleWriteJson") public class DoubleWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/FloatWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/FloatWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/FloatWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/FloatWriteJsonNode.java index 385f7947d..035eee992 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/FloatWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/FloatWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "FloatWriteJson") public class FloatWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IntWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntWriteJsonNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IntWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntWriteJsonNode.java index 8e4435ff5..37a88af28 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IntWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "IntWriteJson") public class IntWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IntervalWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntervalWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IntervalWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntervalWriteJsonNode.java index 74423a201..32c8e2b36 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IntervalWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntervalWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; @NodeInfo(shortName = "IntervalWriteJson") public class IntervalWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IterableWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IterableWriteJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IterableWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IterableWriteJsonNode.java index bc329d4e9..7638b1d34 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/IterableWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IterableWriteJsonNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; @NodeInfo(shortName = "IterableWriteJson") public class IterableWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ListWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ListWriteJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ListWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ListWriteJsonNode.java index 591591131..e788acbba 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ListWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ListWriteJsonNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; @NodeInfo(shortName = "ListWriteJson") public class ListWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/LongWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/LongWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/LongWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/LongWriteJsonNode.java index e779b730f..9f4b4aab4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/LongWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/LongWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "LongWriteJson") public class LongWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/NullableWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/NullableWriteJsonNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/NullableWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/NullableWriteJsonNode.java index 56054fd23..d6fd36b9d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/NullableWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/NullableWriteJsonNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "NullableWriteJson") public class NullableWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/OrWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/OrWriteJsonNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/OrWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/OrWriteJsonNode.java index 9374c34d5..7e077367a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/OrWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/OrWriteJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.runtime.or.OrObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; @NodeInfo(shortName = "OrWriteJson") public class OrWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/RecordWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/RecordWriteJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/RecordWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/RecordWriteJsonNode.java index 3ea504751..dc9f1490b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/RecordWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/RecordWriteJsonNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; public class RecordWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ShortWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ShortWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ShortWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ShortWriteJsonNode.java index 91b88987f..78ad80f64 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/ShortWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ShortWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "ShortWriteJson") public class ShortWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/StringWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/StringWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/StringWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/StringWriteJsonNode.java index ec2b49b12..486a8f303 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/StringWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/StringWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "StringWriteJson") public class StringWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TimeWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimeWriteJsonNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TimeWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimeWriteJsonNode.java index 6ff64e0fc..5433a5a86 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TimeWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimeWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeWriteJson") public class TimeWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TimestampWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimestampWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TimestampWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimestampWriteJsonNode.java index 5881314ae..51108529f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TimestampWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimestampWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampWriteJson") public class TimestampWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java index be1523118..9f4b2c65a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.runtime.exceptions.json.JsonWriterRawTruffleException; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonWriterRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "TryableUnsafeWriteJson") public class TryableUnsafeWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TryableWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TryableWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableWriteJsonNode.java index 98f938934..15d1136fc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/TryableWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableWriteJsonNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramStatementNode; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodes; -import raw.runtime.truffle.ast.io.json.writer.JsonWriteNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "TryableWriteJson") public class TryableWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/UndefinedWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/UndefinedWriteJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/UndefinedWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/UndefinedWriteJsonNode.java index 65b85ca58..ff743bfd4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/json/writer/internal/UndefinedWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/UndefinedWriteJsonNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.StatementNode; +import com.rawlabs.snapi.truffle.runtime.StatementNode; @NodeInfo(shortName = "UndefinedWriteJson") public class UndefinedWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/kryo/KryoFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoFromNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/kryo/KryoFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoFromNode.java index f87b1e25b..3034a3eb8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/kryo/KryoFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.kryo; +package com.rawlabs.snapi.truffle.runtime.ast.io.kryo; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; import java.io.ByteArrayInputStream; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.kryo.KryoNodes; -import raw.runtime.truffle.runtime.kryo.KryoNodesFactory; public class KryoFromNode extends ExpressionNode { @Child private ExpressionNode valueNode; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/kryo/KryoWriteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoWriteNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/kryo/KryoWriteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoWriteNode.java index b22bc1374..0356d34d0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/kryo/KryoWriteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoWriteNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.kryo; +package com.rawlabs.snapi.truffle.runtime.ast.io.kryo; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; import java.io.ByteArrayOutputStream; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.kryo.KryoNodes; -import raw.runtime.truffle.runtime.kryo.KryoNodesFactory; public class KryoWriteNode extends ExpressionNode { @Child private ExpressionNode valueNode; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java index 5e03ae1a0..3f9c6422f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; @NodeInfo(shortName = "AttributeParsePrimitiveXml") public class AttributeParsePrimitiveXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/BoolParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/BoolParseXmlNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/BoolParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/BoolParseXmlNode.java index 547298b0a..2d7284b9a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/BoolParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/BoolParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "BoolParseXml") public abstract class BoolParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ByteParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ByteParseXmlNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ByteParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ByteParseXmlNode.java index ac8038b4c..80644b01e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ByteParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ByteParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "ByteParseXml") public abstract class ByteParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DateParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DateParseXmlNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DateParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DateParseXmlNode.java index dc73db39b..f5930e075 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DateParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DateParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; @NodeInfo(shortName = "DateParseXml") public abstract class DateParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DecimalParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DecimalParseXmlNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DecimalParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DecimalParseXmlNode.java index 39899aeb6..6bca17af7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DecimalParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DecimalParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalParseXml") public abstract class DecimalParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DoubleParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DoubleParseXmlNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DoubleParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DoubleParseXmlNode.java index 51849e4dc..5337a56ba 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/DoubleParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DoubleParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "DoubleParseXml") public abstract class DoubleParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java index 9f318ea31..2e04a2ad0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; @NodeInfo(shortName = "ElementParseXml") public class ElementParseXmlPrimitiveNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/FloatParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/FloatParseXmlNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/FloatParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/FloatParseXmlNode.java index 6c3f0ab02..b883018cc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/FloatParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/FloatParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "FloatParseXml") public abstract class FloatParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/IntParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IntParseXmlNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/IntParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IntParseXmlNode.java index 128ce646c..008b48e96 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/IntParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IntParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "IntParseXml") public abstract class IntParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/IterableParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IterableParseXmlNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/IterableParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IterableParseXmlNode.java index c41c634f7..d9756ee76 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/IterableParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IterableParseXmlNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; @NodeInfo(shortName = "IterableParseXml") public class IterableParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/LongParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/LongParseXmlNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/LongParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/LongParseXmlNode.java index 98689d59d..c4d7d0d54 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/LongParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/LongParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "LongParseXml") public abstract class LongParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/NullableParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/NullableParseXmlNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/NullableParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/NullableParseXmlNode.java index c8d443de8..ef705a11c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/NullableParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/NullableParseXmlNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; -import raw.runtime.truffle.runtime.exceptions.json.JsonExpectedNothingException; -import raw.runtime.truffle.runtime.exceptions.json.JsonParserRawTruffleException; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; public class NullableParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/OptionParseXmlTextNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OptionParseXmlTextNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/OptionParseXmlTextNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OptionParseXmlTextNode.java index 9d066e30a..893e863dd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/OptionParseXmlTextNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OptionParseXmlTextNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; @NodeInfo(shortName = "OptionParseXmlText") public class OptionParseXmlTextNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/OrTypeParseXml.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OrTypeParseXml.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/OrTypeParseXml.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OrTypeParseXml.java index a09b08c7d..550146dfa 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/OrTypeParseXml.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OrTypeParseXml.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlOrTypeParserException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; import java.util.ArrayList; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.xml.XmlOrTypeParserException; -import raw.runtime.truffle.runtime.exceptions.xml.XmlParserRawTruffleException; -import raw.runtime.truffle.runtime.or.OrObject; @NodeInfo(shortName = "OrTypeParseXml") public class OrTypeParseXml extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParser.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParser.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParser.java index c4e272039..e3b3efe5d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParser.java @@ -10,9 +10,19 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -25,16 +35,6 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import org.apache.commons.text.StringEscapeUtils; -import raw.runtime.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.exceptions.xml.XmlParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.xml.XmlReaderRawTruffleException; -import raw.runtime.truffle.runtime.primitives.DateObject; -import raw.runtime.truffle.runtime.primitives.DecimalObject; -import raw.runtime.truffle.runtime.primitives.TimeObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; -import raw.runtime.truffle.utils.RawTruffleCharStream; -import raw.runtime.truffle.utils.RawTruffleStringCharStream; public class RawTruffleXmlParser { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParserFactory.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParserFactory.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java index c15f51004..546346354 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParserFactory.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.ctc.wstx.api.WstxInputProperties; import com.ctc.wstx.stax.WstxInputFactory; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParserSettings.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParserSettings.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java index 281f73d46..f5de300df 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RawTruffleXmlParserSettings.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; public class RawTruffleXmlParserSettings { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RecordParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RecordParseXmlNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RecordParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RecordParseXmlNode.java index 30e3ea5b1..dbcd7fcd8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/RecordParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RecordParseXmlNode.java @@ -10,25 +10,25 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; -import static raw.runtime.truffle.ast.expressions.record.RecordStaticInitializers.hasDuplicateKeys; +import static com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordStaticInitializers.hasDuplicateKeys; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; import java.util.*; -import raw.compiler.base.source.Type; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.xml.XmlParserRawTruffleException; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.NullObject; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; @NodeInfo(shortName = "RecordParseXml") public class RecordParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ShortParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ShortParseXmlNode.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ShortParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ShortParseXmlNode.java index 2f491d86b..6ebbd2438 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/ShortParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ShortParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "ShortParseXml") public abstract class ShortParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/StringParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/StringParseXmlNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/StringParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/StringParseXmlNode.java index d94e07dd5..baa2fb8db 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/StringParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/StringParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeInfo(shortName = "StringParseXml") public abstract class StringParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TextParseXmlPrimitiveNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TextParseXmlPrimitiveNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TextParseXmlPrimitiveNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TextParseXmlPrimitiveNode.java index f1a45cf1d..71bbd2e48 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TextParseXmlPrimitiveNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TextParseXmlPrimitiveNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; @NodeInfo(shortName = "TextParseXml") public class TextParseXmlPrimitiveNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TimeParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimeParseXmlNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TimeParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimeParseXmlNode.java index ff1f125df..1a1c00f0c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TimeParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimeParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeParseXml") public abstract class TimeParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TimestampParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimestampParseXmlNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TimestampParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimestampParseXmlNode.java index 7a8544841..dc94f8de9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TimestampParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimestampParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampParseXml") public abstract class TimestampParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TryableParseAttributeXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseAttributeXmlNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TryableParseAttributeXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseAttributeXmlNode.java index 0a1809c78..bfa3a1d39 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TryableParseAttributeXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseAttributeXmlNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseAttributeXml") public class TryableParseAttributeXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TryableParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseXmlNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TryableParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseXmlNode.java index b3f9d33b1..681c5404c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/TryableParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseXmlNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.exceptions.xml.XmlParserRawTruffleException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseXml") public class TryableParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/UndefinedParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/UndefinedParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/UndefinedParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/UndefinedParseXmlNode.java index 490324ede..ac58e4cf5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/UndefinedParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/UndefinedParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.xml.XmlExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlExpectedNothingException; @NodeInfo(shortName = "UndefinedParseXml") public abstract class UndefinedParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlParseCollectionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseCollectionNode.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlParseCollectionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseCollectionNode.java index 826ec3514..6adeb22b0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlParseCollectionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseCollectionNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.iterable.sources.XmlParseCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.XmlParseCollection; @NodeInfo(shortName = "XmlParseCollection") public class XmlParseCollectionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlParseValueNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseValueNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlParseValueNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseValueNode.java index d0f71ae9f..e555460c1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlParseValueNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseValueNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; @NodeInfo(shortName = "XmlParseValue") public class XmlParseValueNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlReadCollectionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadCollectionNode.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlReadCollectionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadCollectionNode.java index c3775f9ae..b488e83b4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlReadCollectionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadCollectionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.runtime.iterable.sources.XmlReadCollection; -import raw.runtime.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.XmlReadCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; @NodeInfo(shortName = "XmlReadCollection") public class XmlReadCollectionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlReadValueNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadValueNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlReadValueNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadValueNode.java index 70fc261c5..06c1e5130 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/io/xml/parser/XmlReadValueNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadValueNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.xml.XmlParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.xml.XmlReaderRawTruffleException; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleCharInputStream; -import raw.runtime.truffle.utils.TruffleInputStream; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; @NodeInfo(shortName = "XmlReadValue") public class XmlReadValueNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadClosureVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadClosureVariableNode.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadClosureVariableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadClosureVariableNode.java index f3b42477e..32d42fc1a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadClosureVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadClosureVariableNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.local; +package com.rawlabs.snapi.truffle.runtime.ast.local; import com.oracle.truffle.api.TruffleLogger; import com.oracle.truffle.api.dsl.Idempotent; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; @ImportStatic(TypeGuards.class) @NodeField(name = "depth", type = Integer.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadLocalVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadLocalVariableNode.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadLocalVariableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadLocalVariableNode.java index 67a249456..8c2be93de 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadLocalVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadLocalVariableNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.local; +package com.rawlabs.snapi.truffle.runtime.ast.local; import com.oracle.truffle.api.dsl.Idempotent; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeField; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; @ImportStatic(TypeGuards.class) @NodeField(name = "slot", type = int.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadParamClosureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamClosureNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadParamClosureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamClosureNode.java index edf76e9d0..b8856fbe4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadParamClosureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamClosureNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.local; +package com.rawlabs.snapi.truffle.runtime.ast.local; import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class ReadParamClosureNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadParamNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadParamNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamNode.java index 48475a1de..55b64282f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/ReadParamNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.local; +package com.rawlabs.snapi.truffle.runtime.ast.local; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class ReadParamNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/WriteLocalVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/WriteLocalVariableNode.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/WriteLocalVariableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/WriteLocalVariableNode.java index c518f7cf7..caccca11b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/local/WriteLocalVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/WriteLocalVariableNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.local; +package com.rawlabs.snapi.truffle.runtime.ast.local; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; @ImportStatic(TypeGuards.class) @NodeChild("value") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/OSRGeneratorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/OSRGeneratorNode.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/OSRGeneratorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/OSRGeneratorNode.java index eb7682797..4ddf67e39 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/OSRGeneratorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/OSRGeneratorNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr; +package com.rawlabs.snapi.truffle.runtime.ast.osr; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RepeatingNode; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; public class OSRGeneratorNode extends Node implements RepeatingNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java index 7a9524247..80878727b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; public class OSRCollectionEquiJoinInitBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionFilterBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionFilterBodyNode.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionFilterBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionFilterBodyNode.java index 8c519a9fa..a8068f186 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionFilterBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionFilterBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; public class OSRCollectionFilterBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java index 462edc7b4..96d0523f4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; -import raw.runtime.truffle.runtime.kryo.KryoNodes; -import raw.runtime.truffle.runtime.kryo.KryoNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; public class OSRCollectionJoinInitBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionMkStringBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionMkStringBodyNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionMkStringBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionMkStringBodyNode.java index da4560d8e..eb15141f5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRCollectionMkStringBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionMkStringBodyNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; public class OSRCollectionMkStringBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRDistinctGetGeneratorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRDistinctGetGeneratorNode.java similarity index 68% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRDistinctGetGeneratorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRDistinctGetGeneratorNode.java index 0d61db5d5..722ec1d1f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRDistinctGetGeneratorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRDistinctGetGeneratorNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; public class OSRDistinctGetGeneratorNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSREquiJoinNextBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSREquiJoinNextBodyNode.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSREquiJoinNextBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSREquiJoinNextBodyNode.java index a439eb397..c75681a3e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSREquiJoinNextBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSREquiJoinNextBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; -import raw.runtime.truffle.runtime.operators.OperatorNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; public class OSREquiJoinNextBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRExistsBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRExistsBodyNode.java similarity index 73% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRExistsBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRExistsBodyNode.java index 0c16c2792..6b0138733 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRExistsBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRExistsBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; public class OSRExistsBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRJoinNextBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRJoinNextBodyNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRJoinNextBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRJoinNextBodyNode.java index 4ec5fee6f..e08f61d89 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRJoinNextBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRJoinNextBodyNode.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; -import raw.runtime.truffle.runtime.kryo.KryoNodes; -import raw.runtime.truffle.runtime.kryo.KryoNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; public class OSRJoinNextBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java similarity index 71% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java index 888cb9455..4fbf41bb3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; public class OSRListEquiJoinInitBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListFilterBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFilterBodyNode.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListFilterBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFilterBodyNode.java index 4f2aa5edb..889da52c6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListFilterBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFilterBodyNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; import java.util.ArrayList; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodesFactory; public class OSRListFilterBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListFromBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFromBodyNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListFromBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFromBodyNode.java index f7e91020a..fadd72a9f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListFromBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFromBodyNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; import java.util.ArrayList; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRListFromBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListParseJsonBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListParseJsonBodyNode.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListParseJsonBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListParseJsonBodyNode.java index f37bc3fa6..d734960b1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListParseJsonBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListParseJsonBodyNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.util.ArrayList; -import raw.runtime.truffle.ExpressionNode; public class OSRListParseJsonBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListTransformBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListTransformBodyNode.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListTransformBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListTransformBodyNode.java index 44ddc816c..7da74cfb4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRListTransformBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListTransformBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodes; -import raw.runtime.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; public class OSRListTransformBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRMultiAggregationBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRMultiAggregationBodyNode.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRMultiAggregationBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRMultiAggregationBodyNode.java index 03d902729..f3f3c9dd9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRMultiAggregationBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRMultiAggregationBodyNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregatorNodes; -import raw.runtime.truffle.ast.expressions.aggregation.AggregatorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; public class OSRMultiAggregationBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSROrderByGetGeneratorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSROrderByGetGeneratorNode.java similarity index 69% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSROrderByGetGeneratorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSROrderByGetGeneratorNode.java index c0f61c2c6..5190bc4c8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSROrderByGetGeneratorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSROrderByGetGeneratorNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import raw.runtime.truffle.runtime.iterable.operations.OrderByCollection; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.OrderByCollection; public class OSROrderByGetGeneratorNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRSingleAggregationBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRSingleAggregationBodyNode.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRSingleAggregationBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRSingleAggregationBodyNode.java index 8dcc37cbe..19935adb2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRSingleAggregationBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRSingleAggregationBodyNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.expressions.aggregation.AggregatorNodes; -import raw.runtime.truffle.ast.expressions.aggregation.AggregatorNodesFactory; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodes; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; public class OSRSingleAggregationBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRToArrayBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRToArrayBodyNode.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRToArrayBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRToArrayBodyNode.java index 4fe75e237..dbe9fd1ff 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/bodies/OSRToArrayBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRToArrayBodyNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.bodies; +package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; +import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2Type; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.TypeGuards; public class OSRToArrayBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRCollectionFilterConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRCollectionFilterConditionNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRCollectionFilterConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRCollectionFilterConditionNode.java index d88f4833f..65bfc17de 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRCollectionFilterConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRCollectionFilterConditionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.conditions; +package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; public class OSRCollectionFilterConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRExistsConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRExistsConditionNode.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRExistsConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRExistsConditionNode.java index 4095cc977..93c6f8158 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRExistsConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRExistsConditionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.conditions; +package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; public class OSRExistsConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRFromBodyConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRFromBodyConditionNode.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRFromBodyConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRFromBodyConditionNode.java index b97609c54..bf4d7dd85 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRFromBodyConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRFromBodyConditionNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.conditions; +package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class OSRFromBodyConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRHasNextConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRHasNextConditionNode.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRHasNextConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRHasNextConditionNode.java index 3cfa26bd0..5ae2ab9fd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRHasNextConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRHasNextConditionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.conditions; +package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; public class OSRHasNextConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java index 7b3619778..648d6d186 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.conditions; +package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; public class OSRIsLessThanSizeConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRListParseJsonConditionNode.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRListParseJsonConditionNode.java index 4a36be469..f7786ef2a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRListParseJsonConditionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.ast.osr.conditions; +package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; public class OSRListParseJsonConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/boundary/RawTruffleBoundaries.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/boundary/RawTruffleBoundaries.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/boundary/RawTruffleBoundaries.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/boundary/RawTruffleBoundaries.java index b02cd2272..3d2ce8176 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/boundary/RawTruffleBoundaries.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/boundary/RawTruffleBoundaries.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.boundary; +package com.rawlabs.snapi.truffle.runtime.boundary; import com.oracle.truffle.api.CompilerDirectives; import java.util.BitSet; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapIterator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapIterator.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapIterator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapIterator.java index 29d218117..2c6eb81ff 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapIterator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapIterator.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; -import static raw.runtime.truffle.runtime.data_structures.treemap.TreeMapStatic.predecessor; -import static raw.runtime.truffle.runtime.data_structures.treemap.TreeMapStatic.successor; +import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.predecessor; +import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.successor; import java.util.ConcurrentModificationException; import java.util.NoSuchElementException; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNode.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNode.java index b12c1d971..687b8c553 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNode.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; -import static raw.runtime.truffle.runtime.data_structures.treemap.TreeMapStatic.BLACK; +import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.BLACK; public class TreeMapNode { Object key; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNodes.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNodes.java index 65abc35fa..dd5d9a031 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNodes.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.PropertyType; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; import java.util.ArrayList; -import raw.runtime.truffle.PropertyType; -import raw.runtime.truffle.runtime.operators.OperatorNodes; public class TreeMapNodes { @NodeInfo(shortName = "TreeMap.GetOrCreate") @GenerateUncached @GenerateInline - @ImportStatic(raw.runtime.truffle.PropertyType.class) + @ImportStatic(com.rawlabs.snapi.truffle.runtime.PropertyType.class) public abstract static class TreeMapGetOrCreate extends Node { public abstract Object execute(Node node, TreeMapObject mapObject, Object key); @@ -63,7 +63,7 @@ static Object exec( @NodeInfo(shortName = "TreeMap.GetOrCreateDistinct") @GenerateUncached @GenerateInline - @ImportStatic(raw.runtime.truffle.PropertyType.class) + @ImportStatic(com.rawlabs.snapi.truffle.runtime.PropertyType.class) public abstract static class TreeMapGetOrCreateDistinct extends Node { public abstract boolean execute(Node node, TreeMapObject mapObject, Object key); diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapObject.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapObject.java index 333d7b40e..eca28f3e3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; -import static raw.runtime.truffle.runtime.data_structures.treemap.TreeMapStatic.*; +import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.*; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapStatic.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapStatic.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapStatic.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapStatic.java index 53ba33813..c8e0cd1a5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/data_structures/treemap/TreeMapStatic.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapStatic.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; public class TreeMapStatic { public static final boolean RED = false; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/BreakException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/BreakException.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/BreakException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/BreakException.java index ac0f48c4a..362b1953a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/BreakException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/BreakException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; import com.oracle.truffle.api.nodes.ControlFlowException; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleInternalErrorException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleInternalErrorException.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleInternalErrorException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleInternalErrorException.java index 692baaa13..20fba1d44 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleInternalErrorException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleInternalErrorException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleRuntimeException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleRuntimeException.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleRuntimeException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleRuntimeException.java index ab276a8c1..54ff3cc2a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleRuntimeException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleRuntimeException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.exception.AbstractTruffleException; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleUnexpectedNullException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleUnexpectedNullException.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleUnexpectedNullException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleUnexpectedNullException.java index 475e9ea21..258624c36 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleUnexpectedNullException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleUnexpectedNullException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleValidationException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleValidationException.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleValidationException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleValidationException.java index 4baf95a2a..a53564ba7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/RawTruffleValidationException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleValidationException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.exception.AbstractTruffleException; @@ -18,10 +18,10 @@ import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.compiler.Message; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation.ValidationErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.List; -import raw.client.api.Message; -import raw.runtime.truffle.runtime.exceptions.validation.ValidationErrorObject; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class RawTruffleValidationException extends AbstractTruffleException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/ReadLinesRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/ReadLinesRawTruffleException.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/ReadLinesRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/ReadLinesRawTruffleException.java index 32dd1e211..9614bb77c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/ReadLinesRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/ReadLinesRawTruffleException.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class ReadLinesRawTruffleException extends RawTruffleRuntimeException { public ReadLinesRawTruffleException( diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/binary/BinaryWriterRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/binary/BinaryWriterRawTruffleException.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/binary/BinaryWriterRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/binary/BinaryWriterRawTruffleException.java index aa0c3c40e..6d1ae5aa8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/binary/BinaryWriterRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/binary/BinaryWriterRawTruffleException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.binary; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.binary; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class BinaryWriterRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvExpectedNothingException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvExpectedNothingException.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvExpectedNothingException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvExpectedNothingException.java index b06f47836..1297fc17d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvExpectedNothingException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvExpectedNothingException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParser; -import raw.runtime.truffle.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; public class CsvExpectedNothingException extends CsvParserRawTruffleException { public CsvExpectedNothingException( diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvParserRawTruffleException.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvParserRawTruffleException.java index ef026c7c9..2dae1f54f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvParserRawTruffleException.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParser; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; public class CsvParserRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvReaderRawTruffleException.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvReaderRawTruffleException.java index 5bd25154c..a237d9249 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvReaderRawTruffleException.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParser; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; public class CsvReaderRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvWriterRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvWriterRawTruffleException.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvWriterRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvWriterRawTruffleException.java index 0424045ed..4f2c789fb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/csv/CsvWriterRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvWriterRawTruffleException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class CsvWriterRawTruffleException extends RawTruffleRuntimeException { @CompilerDirectives.TruffleBoundary diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonExpectedNothingException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonExpectedNothingException.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonExpectedNothingException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonExpectedNothingException.java index aa6c4d03a..9446dd51c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonExpectedNothingException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonExpectedNothingException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonOrTypeException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonOrTypeException.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonOrTypeException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonOrTypeException.java index 3aae5b754..923418e10 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonOrTypeException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonOrTypeException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonParserRawTruffleException.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonParserRawTruffleException.java index 66a97bf22..6e4ee8259 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonParserRawTruffleException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class JsonParserRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonReaderRawTruffleException.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonReaderRawTruffleException.java index 8ed48972d..e073bb540 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonReaderRawTruffleException.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class JsonReaderRawTruffleException extends RawTruffleRuntimeException { @TruffleBoundary diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonRecordFieldNotFoundException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonRecordFieldNotFoundException.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonRecordFieldNotFoundException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonRecordFieldNotFoundException.java index 49e8ca1a3..418429ad4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonRecordFieldNotFoundException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonRecordFieldNotFoundException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonUnexpectedTokenException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonUnexpectedTokenException.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonUnexpectedTokenException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonUnexpectedTokenException.java index fe48fc9bd..bf742988e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonUnexpectedTokenException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonUnexpectedTokenException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonWriterRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonWriterRawTruffleException.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonWriterRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonWriterRawTruffleException.java index 84cf4e959..cc691aea1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/json/JsonWriterRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonWriterRawTruffleException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class JsonWriterRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java index d1ebe7349..76241972a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.JdbcQuery; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; import java.sql.SQLException; -import raw.runtime.truffle.ast.io.jdbc.JdbcQuery; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; public class JdbcExceptionHandler { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java index 3de08e2f1..739e7078c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class JdbcParserRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java index 4ab817cdb..5aeb51ea2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.jdbc.JdbcQuery; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.JdbcQuery; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class JdbcReaderRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/MySQLExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/MySQLExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/MySQLExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/MySQLExceptionHandler.java index f01248aeb..229a52923 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/MySQLExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/MySQLExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; public class MySQLExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/OracleExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/OracleExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/OracleExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/OracleExceptionHandler.java index f6dc2e885..94a7305c7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/OracleExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/OracleExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; public class OracleExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java index 707e79dcc..efbbf906e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; public class PostgreSQLExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java index 5034c8fcc..e6eddf045 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; public class SnowflakeExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/SqlServerExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SqlServerExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/SqlServerExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SqlServerExceptionHandler.java index 41f294fdb..01ba4f3dc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/rdbms/SqlServerExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SqlServerExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; public class SqlServerExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorMessage.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorMessage.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorMessage.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorMessage.java index c7bba697a..a20b164fd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorMessage.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorMessage.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorObject.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorObject.java index eae9585d7..9bf31663f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorObject.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.compiler.Message; import java.util.List; -import raw.client.api.Message; @ExportLibrary(InteropLibrary.class) public class ValidationErrorObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorPosition.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorPosition.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorPosition.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorPosition.java index 880ccccba..12daa1928 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorPosition.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorPosition.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import raw.runtime.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class ValidationErrorPosition implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorRange.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorRange.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorRange.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorRange.java index e5c215b37..c4c4d3f8d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/validation/ValidationErrorRange.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorRange.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import raw.runtime.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class ValidationErrorRange implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlExpectedNothingException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlExpectedNothingException.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlExpectedNothingException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlExpectedNothingException.java index 9542aad4d..110cfb564 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlExpectedNothingException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlExpectedNothingException.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; public class XmlExpectedNothingException extends XmlParserRawTruffleException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlOrTypeParserException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlOrTypeParserException.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlOrTypeParserException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlOrTypeParserException.java index 891f67f78..481ca4c22 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlOrTypeParserException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlOrTypeParserException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; import java.util.List; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; public class XmlOrTypeParserException extends XmlParserRawTruffleException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlParserRawTruffleException.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlParserRawTruffleException.java index d5a94d367..0a5c28263 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlParserRawTruffleException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class XmlParserRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlReaderRawTruffleException.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlReaderRawTruffleException.java index 4923332a5..6485ec8bf 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/exceptions/xml/XmlReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlReaderRawTruffleException.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; public class XmlReaderRawTruffleException extends RawTruffleRuntimeException { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Closure.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Closure.java similarity index 98% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Closure.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Closure.java index 6d1f446fa..0e93e7cdd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Closure.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Closure.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; @@ -29,9 +29,9 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; -import raw.runtime.truffle.runtime.list.StringList; // Runtime function object that encloses a materialized frame because it has free variables. @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Function.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Function.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Function.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Function.java index 501ee9f6c..f3626ec31 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Function.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Function.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/FunctionExecuteNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionExecuteNodes.java similarity index 98% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/FunctionExecuteNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionExecuteNodes.java index 0b1a39369..1f65d26ba 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/FunctionExecuteNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionExecuteNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/FunctionRegistryObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionRegistryObject.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/FunctionRegistryObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionRegistryObject.java index 560c60666..5c833c296 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/FunctionRegistryObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionRegistryObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; @@ -18,10 +18,10 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.HashMap; import java.util.Map; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public final class FunctionRegistryObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Lambda.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Lambda.java similarity index 98% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Lambda.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Lambda.java index ae5d50df6..41be9c355 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/Lambda.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Lambda.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; @@ -25,7 +25,7 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; // A function runtime object that doesn't have any default arguments and doesn't capture any free // variables. diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/RawFunctionRegistry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RawFunctionRegistry.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/RawFunctionRegistry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RawFunctionRegistry.java index 7874f4e74..f8abdc073 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/RawFunctionRegistry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RawFunctionRegistry.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/RecClosure.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RecClosure.java similarity index 98% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/RecClosure.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RecClosure.java index 53ff8427a..6dd801ccd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/function/RecClosure.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RecClosure.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.function; +package com.rawlabs.snapi.truffle.runtime.runtime.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; @@ -29,9 +29,9 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; -import raw.runtime.truffle.runtime.list.StringList; // A recursive function closure // Duplicate of Closure.java. It is differentiated in order to apply recursion optimizations in the diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/GeneratorNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/GeneratorNodes.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/GeneratorNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/GeneratorNodes.java index 81185510d..ab93008a2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/GeneratorNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/GeneratorNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection; import com.esotericsoftware.kryo.KryoException; import com.esotericsoftware.kryo.io.Input; @@ -19,29 +19,29 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.ComputeNextNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.InputBufferNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaperNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.list.ListGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.ArrayList; import java.util.Arrays; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapNode; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.ComputeNextNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer.InputBufferNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaperNodes; -import raw.runtime.truffle.runtime.generator.list.ListGenerator; -import raw.runtime.truffle.runtime.kryo.KryoNodes; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.operators.OperatorNodes; public class GeneratorNodes { @NodeInfo(shortName = "AbstractGenerator.Next") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/StaticInitializers.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/StaticInitializers.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/StaticInitializers.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/StaticInitializers.java index c8a4e7e95..e618e7628 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/StaticInitializers.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/StaticInitializers.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.utils.IOUtils; +import com.rawlabs.utils.core.RawSettings; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.OutputStream; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import raw.runtime.truffle.utils.IOUtils; -import raw.utils.RawSettings; public class StaticInitializers { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/AbstractGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/AbstractGenerator.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/AbstractGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/AbstractGenerator.java index 9aba5de9b..b1f207af0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/AbstractGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/AbstractGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,10 +21,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.Objects; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class AbstractGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java index 916c5dd0b..07144b2ef 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; @@ -24,43 +24,43 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.RawContext; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.CsvParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.*; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRCollectionFilterConditionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRFromBodyConditionNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlReaderRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.*; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.*; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.EmptyCollection; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.utils.IOUtils; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; +import com.rawlabs.utils.core.RawSettings; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import raw.runtime.truffle.RawContext; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.io.csv.reader.CsvParserNodes; -import raw.runtime.truffle.ast.io.json.reader.JsonParserNodes; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.*; -import raw.runtime.truffle.ast.osr.conditions.OSRCollectionFilterConditionNode; -import raw.runtime.truffle.ast.osr.conditions.OSRFromBodyConditionNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.exceptions.csv.CsvParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.csv.CsvReaderRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.json.JsonReaderRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.xml.XmlParserRawTruffleException; -import raw.runtime.truffle.runtime.exceptions.xml.XmlReaderRawTruffleException; -import raw.runtime.truffle.runtime.function.FunctionExecuteNodes; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.*; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.*; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.iterable.sources.EmptyCollection; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; -import raw.runtime.truffle.utils.IOUtils; -import raw.runtime.truffle.utils.RawTruffleStringCharStream; -import raw.runtime.truffle.utils.TruffleCharInputStream; -import raw.runtime.truffle.utils.TruffleInputStream; -import raw.utils.RawSettings; public class ComputeNextNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java index 55ef9b9d9..a3786a332 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; import com.oracle.truffle.api.frame.MaterializedFrame; -import raw.compiler.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; public class EquiJoinComputeNext { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java index 61b3a3501..fccf32a35 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; import com.oracle.truffle.api.frame.MaterializedFrame; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java index 1c8bbdee7..a7b40454c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.MaterializedFrame; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; import java.io.File; -import raw.compiler.rql2.source.Rql2TypeWithProperties; public class JoinComputeNext { @CompilationFinal private File diskRight; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java index 05ac86edc..80b94652d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; public class TakeComputeNext { private final Object parent; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java index e7d1ba361..0b517112e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; public class TransformComputeNext { final Object parent; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java index 862bc398d..b963b6e3e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; public class UnnestComputeNext { final Object parent; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java index ea9d565ab..b8d6cfd78 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; public class ZipComputeNext { private final Object parent1; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java index 370871fd7..e0e27faee 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParser; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class CsvReadComputeNext { private final LocationObject location; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java index de2c36242..24f1b27ab 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParser; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import raw.runtime.truffle.utils.RawTruffleCharStream; -import raw.runtime.truffle.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; public class CsvReadFromStringComputeNext { private final RawTruffleCharStream stream; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java similarity index 82% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java index d9e56a876..a403b8c42 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; public class EmptyComputeNext { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java index 2b0c761d9..c1dad974b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; public class ExpressionComputeNext { private final Object[] values; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java index 91fa1cc8d..c10e52c5f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import static java.lang.Math.addExact; -import raw.runtime.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; public class IntRangeComputeNext { private final int end; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java index 6925e3b20..6b2a724b5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import raw.runtime.truffle.ast.io.jdbc.JdbcQuery; -import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.JdbcQuery; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawSettings; public class JdbcQueryComputeNext { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java index f7833e871..67cd6dbf5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.RootCallTarget; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class JsonReadComputeNext { private final LocationObject locationObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java index 20eea7ed4..783831159 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import static java.lang.Math.addExact; -import raw.runtime.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; public class LongRangeComputeNext { private final long end; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java index e36ea5943..15ef9af6b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.ReadLinesRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import java.io.BufferedReader; import java.io.IOException; import org.apache.commons.io.IOUtils; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.exceptions.ReadLinesRawTruffleException; -import raw.runtime.truffle.utils.TruffleCharInputStream; public class ReadLinesComputeNext { private final TruffleCharInputStream stream; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java index 4ddfa1b72..9809e05a6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; import java.time.LocalDateTime; -import raw.runtime.truffle.runtime.exceptions.BreakException; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; public class TimestampRangeComputeNext { private final LocalDateTime end; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java index 6a879ce75..ad8c6f1c2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; public class UnionComputeNext { private final Object[] inputs; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java similarity index 80% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java index 430fc75e3..3d8b8fffc 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParserSettings; -import raw.runtime.truffle.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; public class XmlParseComputeNext { private final String text; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java index dc35b2a11..52f90944c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParser; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParserSettings; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.runtime.truffle.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class XmlReadComputeNext { private final LocationObject locationObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java index 8ef207b8b..d8ce2d51f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; public class GroupByInputBuffer { private final OffHeapGroupByKey offHeapGroupByKey; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java index daa5590c3..07fb651b0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; public class InputBufferNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java index 81d6c818b..d5df52437 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; public class OrderByInputBuffer { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java index db3bd512c..24c16e1d5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java @@ -10,29 +10,29 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap; -import static raw.runtime.truffle.runtime.generator.collection.StaticInitializers.*; +import static com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers.*; import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.unsafe.UnsafeOutput; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapNode; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; import java.util.ArrayList; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapIterator; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapNode; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; -import raw.runtime.truffle.runtime.kryo.KryoNodes; public class OffHeapNodes { @NodeInfo(shortName = "OffHeap.Put") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java index 83f4c7e36..4665894f0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,10 +21,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.Objects; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapIterator; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class DistinctMemoryGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java index a792e8040..3670acb15 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.dsl.Bind; @@ -22,10 +22,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class DistinctSpilledFilesGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java index c3cedae1d..6837180b6 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.oracle.truffle.api.frame.MaterializedFrame; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapObject; +import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapObject; -import raw.runtime.truffle.utils.KryoFootPrint; public class OffHeapDistinct { private final TreeMapObject diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java index 729b4f81b..7d21d4600 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,10 +21,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.Objects; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapIterator; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class GroupByMemoryGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java index a0a754870..e538bce48 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,11 +21,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class GroupBySpilledFilesGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java index 808c728ec..2704c564e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapObject; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; +import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapObject; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; -import raw.runtime.truffle.utils.KryoFootPrint; public class OffHeapGroupByKey { private final TreeMapObject diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java index 12eb85a98..5889c126c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapObject; +import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; import java.util.ArrayList; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapObject; -import raw.runtime.truffle.utils.KryoFootPrint; public class OffHeapGroupByKeys { private final int[] keyOrderings; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java index 0f37b5124..8d119663f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,11 +21,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.Iterator; import java.util.Objects; -import raw.runtime.truffle.runtime.data_structures.treemap.TreeMapIterator; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.list.StringList; // A simple in-memory generator over the map. Internally iterates through the // key set and returns items from the values list, one by one. diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java index 5dab27692..7ddb814a4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,11 +21,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class OrderBySpilledFilesGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java index e1c347883..8ba5f343f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper; public class RecordShaper { private final boolean forList; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java index 0973f2f19..c7b0c5a10 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; public class RecordShaperNodes { @NodeInfo(shortName = "RecordShaper.MakeRow") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/list/ListGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/list/ListGenerator.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/list/ListGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/list/ListGenerator.java index 7a79b69b5..d553e7007 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/generator/list/ListGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/list/ListGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.generator.list; +package com.rawlabs.snapi.truffle.runtime.runtime.generator.list; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; import java.util.Objects; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class ListGenerator implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/IterableNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/IterableNodes.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/IterableNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/IterableNodes.java index 7bf7a94c8..8c67161c0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/IterableNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/IterableNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.*; @@ -19,23 +19,23 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.ast.osr.OSRGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSRCollectionEquiJoinInitBodyNode; -import raw.runtime.truffle.ast.osr.bodies.OSRDistinctGetGeneratorNode; -import raw.runtime.truffle.ast.osr.bodies.OSROrderByGetGeneratorNode; -import raw.runtime.truffle.ast.osr.conditions.OSRHasNextConditionNode; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.StaticInitializers; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.*; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; -import raw.runtime.truffle.runtime.iterable.operations.*; -import raw.runtime.truffle.runtime.iterable.sources.*; +import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRCollectionEquiJoinInitBodyNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRDistinctGetGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSROrderByGetGeneratorNode; +import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.*; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.*; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.*; public class IterableNodes { @NodeInfo(shortName = "Iterable.GetGenerator") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/list/ListIterable.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/list/ListIterable.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/list/ListIterable.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/list/ListIterable.java index 59191605b..490c1455b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/list/ListIterable.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/list/ListIterable.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.list; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.list; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.list.ListGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.list.ListGenerator; @ExportLibrary(InteropLibrary.class) public class ListIterable implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/DistinctCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/DistinctCollection.java similarity index 88% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/DistinctCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/DistinctCollection.java index 7dd6a7047..86210bf1d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/DistinctCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/DistinctCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,9 +20,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class DistinctCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/EquiJoinCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/EquiJoinCollection.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/EquiJoinCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/EquiJoinCollection.java index 4490d40c2..ba460a9c9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/EquiJoinCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/EquiJoinCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class EquiJoinCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/FilterCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/FilterCollection.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/FilterCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/FilterCollection.java index 8de52370c..437c2a434 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/FilterCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/FilterCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,8 +20,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class FilterCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/GroupByCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/GroupByCollection.java similarity index 90% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/GroupByCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/GroupByCollection.java index 102699671..48aa0f8ab 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/GroupByCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/GroupByCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,9 +20,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class GroupByCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/JoinCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/JoinCollection.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/JoinCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/JoinCollection.java index bf3d57cba..f9c85afe8 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/JoinCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/JoinCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class JoinCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/OrderByCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/OrderByCollection.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/OrderByCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/OrderByCollection.java index 73ae219cd..32997c82a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/OrderByCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/OrderByCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,9 +20,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.compiler.rql2.source.Rql2TypeWithProperties; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class OrderByCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/TakeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TakeCollection.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/TakeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TakeCollection.java index 8e6fd65c8..a3d47771f 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/TakeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TakeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class TakeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/TransformCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TransformCollection.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/TransformCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TransformCollection.java index 8ca8f5d6c..25596ee09 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/TransformCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TransformCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class TransformCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/UnnestCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/UnnestCollection.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/UnnestCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/UnnestCollection.java index 0f9d307d9..2d996fd87 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/UnnestCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/UnnestCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class UnnestCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/ZipCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/ZipCollection.java similarity index 84% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/ZipCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/ZipCollection.java index 710c51205..4c3ab6592 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/operations/ZipCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/ZipCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class ZipCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/CsvCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvCollection.java similarity index 76% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/CsvCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvCollection.java index 5c06f8108..610690619 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/CsvCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadComputeNext; -import raw.runtime.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; @ExportLibrary(InteropLibrary.class) public class CsvCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/CsvFromStringCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvFromStringCollection.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/CsvFromStringCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvFromStringCollection.java index 482156e8e..a542bf9e2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/CsvFromStringCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvFromStringCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,10 +20,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadFromStringComputeNext; +import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadFromStringComputeNext; @ExportLibrary(InteropLibrary.class) public class CsvFromStringCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/EmptyCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/EmptyCollection.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/EmptyCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/EmptyCollection.java index 06fc97854..5bf72dd19 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/EmptyCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/EmptyCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.EmptyComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.EmptyComputeNext; @ExportLibrary(InteropLibrary.class) public class EmptyCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/ExpressionCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ExpressionCollection.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/ExpressionCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ExpressionCollection.java index 964ed2daf..92b814945 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/ExpressionCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ExpressionCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; @ExportLibrary(InteropLibrary.class) public class ExpressionCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/IntRangeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/IntRangeCollection.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/IntRangeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/IntRangeCollection.java index db6bfa92e..df5dbcfd4 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/IntRangeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/IntRangeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.IntRangeComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.IntRangeComputeNext; @ExportLibrary(InteropLibrary.class) public class IntRangeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/JdbcQueryCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JdbcQueryCollection.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/JdbcQueryCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JdbcQueryCollection.java index 2ed2488c8..55cd1d293 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/JdbcQueryCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JdbcQueryCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,12 +20,12 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.JdbcQueryComputeNext; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.utils.RawSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.JdbcQueryComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawSettings; @ExportLibrary(InteropLibrary.class) public class JdbcQueryCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/JsonReadCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JsonReadCollection.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/JsonReadCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JsonReadCollection.java index 8411dc678..e198c1bcb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/JsonReadCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JsonReadCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,10 +20,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.JsonReadComputeNext; -import raw.runtime.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.JsonReadComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; @ExportLibrary(InteropLibrary.class) public class JsonReadCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/LongRangeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/LongRangeCollection.java similarity index 79% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/LongRangeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/LongRangeCollection.java index 388cefca6..c92838607 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/LongRangeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/LongRangeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.LongRangeComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.LongRangeComputeNext; @ExportLibrary(InteropLibrary.class) public class LongRangeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/ReadLinesCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ReadLinesCollection.java similarity index 75% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/ReadLinesCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ReadLinesCollection.java index 115436cd2..cbd4b2b42 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/ReadLinesCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ReadLinesCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,10 +19,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.ReadLinesComputeNext; -import raw.runtime.truffle.utils.TruffleCharInputStream; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.ReadLinesComputeNext; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; @ExportLibrary(InteropLibrary.class) public class ReadLinesCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/TimestampRangeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/TimestampRangeCollection.java similarity index 74% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/TimestampRangeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/TimestampRangeCollection.java index 17bd7a3cf..90b79e9f7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/TimestampRangeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/TimestampRangeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,11 +19,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.TimestampRangeComputeNext; -import raw.runtime.truffle.runtime.primitives.IntervalObject; -import raw.runtime.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.TimestampRangeComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; @ExportLibrary(InteropLibrary.class) public class TimestampRangeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/UnionCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/UnionCollection.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/UnionCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/UnionCollection.java index 91b58fa29..33d3ddd6e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/UnionCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/UnionCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.UnionComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.UnionComputeNext; @ExportLibrary(InteropLibrary.class) public class UnionCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/XmlParseCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlParseCollection.java similarity index 78% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/XmlParseCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlParseCollection.java index 2cce0c733..26e604b49 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/XmlParseCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlParseCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,10 +20,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParserSettings; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.XmlParseComputeNext; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.XmlParseComputeNext; @ExportLibrary(InteropLibrary.class) public class XmlParseCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/XmlReadCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlReadCollection.java similarity index 77% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/XmlReadCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlReadCollection.java index c047a3469..947869979 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/iterable/sources/XmlReadCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlReadCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import raw.runtime.truffle.ast.io.xml.parser.RawTruffleXmlParserSettings; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.XmlReadComputeNext; -import raw.runtime.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.XmlReadComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; @ExportLibrary(InteropLibrary.class) public class XmlReadCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/kryo/KryoNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/kryo/KryoNodes.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/kryo/KryoNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/kryo/KryoNodes.java index 613a6588b..e5bf4c43d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/kryo/KryoNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/kryo/KryoNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.kryo; +package com.rawlabs.snapi.truffle.runtime.runtime.kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; @@ -20,6 +20,17 @@ import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -27,17 +38,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.ast.TypeGuards; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.list.ListNodes; -import raw.runtime.truffle.runtime.list.ObjectList; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.runtime.record.RecordNodesFactory; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; import scala.collection.immutable.Vector; public class KryoNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/BooleanList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/BooleanList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/BooleanList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/BooleanList.java index 1869c3485..04494248e 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/BooleanList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/BooleanList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class BooleanList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ByteList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ByteList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ByteList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ByteList.java index 4c68f64ef..01ca305d1 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ByteList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ByteList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class ByteList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/DoubleList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/DoubleList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/DoubleList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/DoubleList.java index 103d983ec..75fb77ee0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/DoubleList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/DoubleList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class DoubleList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/FloatList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/FloatList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/FloatList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/FloatList.java index e1eb9fae2..9f50b7605 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/FloatList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/FloatList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class FloatList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/IntList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/IntList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/IntList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/IntList.java index 1d5af1c83..cbba98e19 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/IntList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/IntList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class IntList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ListNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ListNodes.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ListNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ListNodes.java index 3cdc54f50..8437ada6b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ListNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ListNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.GenerateInline; @@ -18,10 +18,10 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; import java.util.ArrayList; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; -import raw.runtime.truffle.runtime.operators.OperatorNodes; public class ListNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/LongList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/LongList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/LongList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/LongList.java index 1ab502733..526dafd00 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/LongList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/LongList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class LongList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ObjectList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ObjectList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ObjectList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ObjectList.java index 5fecf25d6..9bda8066d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ObjectList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ObjectList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class ObjectList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/RawArrayList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/RawArrayList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/RawArrayList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/RawArrayList.java index 8c1408eab..056535084 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/RawArrayList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/RawArrayList.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.ArrayList; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public class RawArrayList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ShortList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ShortList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ShortList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ShortList.java index de96680b1..fce5ab392 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/ShortList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ShortList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class ShortList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/StringList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/StringList.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/StringList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/StringList.java index 36a6db287..6d17958d2 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/list/StringList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/StringList.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.list; +package com.rawlabs.snapi.truffle.runtime.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; import java.util.Arrays; -import raw.runtime.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class StringList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/operators/OperatorNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/operators/OperatorNodes.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/operators/OperatorNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/operators/OperatorNodes.java index be727d75a..369e863bd 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/operators/OperatorNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/operators/OperatorNodes.java @@ -10,26 +10,26 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.operators; +package com.rawlabs.snapi.truffle.runtime.runtime.operators; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.generator.collection.GeneratorNodes; -import raw.runtime.truffle.runtime.iterable.IterableNodes; -import raw.runtime.truffle.runtime.primitives.*; -import raw.runtime.truffle.runtime.record.DuplicateKeyRecord; -import raw.runtime.truffle.runtime.record.PureRecord; -import raw.runtime.truffle.runtime.record.RecordNodes; -import raw.runtime.truffle.tryable_nullable.Nullable; -import raw.runtime.truffle.tryable_nullable.Tryable; -import raw.runtime.truffle.tryable_nullable.TryableNullableNodes; public class OperatorNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/or/OrObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/or/OrObject.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/or/OrObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/or/OrObject.java index dcd36b895..1f75f43d9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/or/OrObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/or/OrObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.or; +package com.rawlabs.snapi.truffle.runtime.runtime.or; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.interop.*; @@ -18,8 +18,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import java.time.*; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public final class OrObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/BinaryObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/BinaryObject.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/BinaryObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/BinaryObject.java index 4630d1465..1c78c9b4a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/BinaryObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/BinaryObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.InvalidBufferOffsetException; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/DateObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DateObject.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/DateObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DateObject.java index 709f11023..b335cdc3d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/DateObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DateObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; -import static raw.runtime.truffle.runtime.primitives.TruffleTemporalFormatter.DATE_FORMATTER; +import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.DATE_FORMATTER; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; @@ -20,8 +20,8 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.time.LocalDate; -import raw.runtime.truffle.RawLanguage; @ExportLibrary(InteropLibrary.class) public final class DateObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/DecimalObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DecimalObject.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/DecimalObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DecimalObject.java index 9aa015176..f699cf7b3 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/DecimalObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DecimalObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; @@ -18,8 +18,8 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.math.BigDecimal; -import raw.runtime.truffle.RawLanguage; @ExportLibrary(InteropLibrary.class) public final class DecimalObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/ErrorObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/ErrorObject.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/ErrorObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/ErrorObject.java index 01a2a840d..ed09ca83d 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/ErrorObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/ErrorObject.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; @ExportLibrary(InteropLibrary.class) public class ErrorObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/IntervalObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/IntervalObject.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/IntervalObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/IntervalObject.java index bfd4b25df..ec8291879 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/IntervalObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/IntervalObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; import java.time.Duration; -import raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; @ExportLibrary(InteropLibrary.class) public final class IntervalObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/LocationKVSettingHash.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationKVSettingHash.java similarity index 83% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/LocationKVSettingHash.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationKVSettingHash.java index 6c13df012..2ecb6b53a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/LocationKVSettingHash.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationKVSettingHash.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.library.ExportMessage; import java.util.Objects; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; -import raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; -import raw.runtime.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; +import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; /* This class is used to export Location KVSettings (as a Hash) */ diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/LocationObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationObject.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/LocationObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationObject.java index 0aa12a31f..f36a73ab0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/LocationObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.interop.InteropLibrary; @@ -19,15 +19,15 @@ import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription; +import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.utils.sources.api.Location; +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation; +import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; +import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation; +import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import java.nio.ByteOrder; -import raw.compiler.rql2.api.LocationDescription; -import raw.compiler.rql2.api.LocationDescription$; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.sources.api.Location; -import raw.sources.bytestream.api.ByteStreamLocation; -import raw.sources.bytestream.http.HttpByteStreamLocation; -import raw.sources.filesystem.api.FileSystemLocation; -import raw.sources.jdbc.api.JdbcServerLocation; /** * Truffle object representing a location. diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/NullObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/NullObject.java similarity index 94% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/NullObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/NullObject.java index 4f439b1f6..9fcf0f86b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/NullObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/NullObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TimeObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimeObject.java similarity index 86% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TimeObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimeObject.java index f516ac348..226a8d5f5 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TimeObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimeObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; -import static raw.runtime.truffle.runtime.primitives.TruffleTemporalFormatter.TIME_FORMATTER; +import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.TIME_FORMATTER; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TimestampObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimestampObject.java similarity index 89% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TimestampObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimestampObject.java index 366290058..bcddf5b99 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TimestampObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimestampObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; -import static raw.runtime.truffle.runtime.primitives.TruffleTemporalFormatter.TIMESTAMP_FORMATTER; +import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.TIMESTAMP_FORMATTER; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TruffleTemporalFormatter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TruffleTemporalFormatter.java similarity index 92% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TruffleTemporalFormatter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TruffleTemporalFormatter.java index ec365d545..50246c206 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/primitives/TruffleTemporalFormatter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TruffleTemporalFormatter.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.runtime.primitives; import java.time.format.DateTimeFormatter; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/DuplicateKeyRecord.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecord.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/DuplicateKeyRecord.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecord.java index 5a7b2576c..0925717b9 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/DuplicateKeyRecord.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecord.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.record; +package com.rawlabs.snapi.truffle.runtime.runtime.record; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.TruffleLanguage; @@ -24,10 +24,10 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; +import com.rawlabs.compiler.utils.RecordFieldsNaming; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.Arrays; import java.util.Vector; -import raw.client.utils.RecordFieldsNaming; -import raw.runtime.truffle.RawLanguage; @ExportLibrary(InteropLibrary.class) public class DuplicateKeyRecord extends DynamicObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/DuplicateKeyRecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecordNodes.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/DuplicateKeyRecordNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecordNodes.java index 673bcd6c8..c14ac3f55 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/DuplicateKeyRecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecordNodes.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.record; +package com.rawlabs.snapi.truffle.runtime.runtime.record; -import static raw.runtime.truffle.PropertyType.*; +import static com.rawlabs.snapi.truffle.runtime.PropertyType.*; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.library.CachedLibrary; @@ -20,8 +20,8 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.object.DynamicObjectLibrary; -import raw.runtime.truffle.PropertyType; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.PropertyType; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; // (az) Whenever using any of these nodes, create one per property public class DuplicateKeyRecordNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/KeysObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/KeysObject.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/KeysObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/KeysObject.java index b2800d539..80c28625a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/KeysObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/KeysObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.record; +package com.rawlabs.snapi.truffle.runtime.runtime.record; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.InvalidArrayIndexException; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/PureRecord.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecord.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/PureRecord.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecord.java index 20b4d9ca6..45d19fc0b 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/PureRecord.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecord.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.record; +package com.rawlabs.snapi.truffle.runtime.runtime.record; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.dsl.Bind; @@ -22,7 +22,7 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; -import raw.runtime.truffle.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; @ExportLibrary(InteropLibrary.class) public class PureRecord extends DynamicObject implements TruffleObject { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/PureRecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecordNodes.java similarity index 96% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/PureRecordNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecordNodes.java index 4d8815e23..72bb75025 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/PureRecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecordNodes.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.record; +package com.rawlabs.snapi.truffle.runtime.runtime.record; -import static raw.runtime.truffle.PropertyType.*; +import static com.rawlabs.snapi.truffle.runtime.PropertyType.*; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.library.CachedLibrary; @@ -20,9 +20,9 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.object.DynamicObjectLibrary; -import raw.runtime.truffle.PropertyType; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.PropertyType; +import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; // (az) Whenever using any of these nodes, create one per property public class PureRecordNodes { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/RecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/RecordNodes.java similarity index 97% rename from snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/RecordNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/RecordNodes.java index 04d7b9a0f..dc7e913a7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/runtime/record/RecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/RecordNodes.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.runtime.record; +package com.rawlabs.snapi.truffle.runtime.runtime.record; -import static raw.runtime.truffle.PropertyType.*; +import static com.rawlabs.snapi.truffle.runtime.PropertyType.*; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/Nullable.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Nullable.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/Nullable.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Nullable.java index 9962bc56e..372a67a4c 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/Nullable.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Nullable.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.tryable_nullable; +package com.rawlabs.snapi.truffle.runtime.tryable_nullable; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; public class Nullable { public static boolean isNull(Object value) { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/Tryable.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Tryable.java similarity index 81% rename from snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/Tryable.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Tryable.java index 8ac326bb3..0edc8d473 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/Tryable.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Tryable.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.tryable_nullable; +package com.rawlabs.snapi.truffle.runtime.tryable_nullable; -import raw.runtime.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; public class Tryable { public static boolean isError(Object value) { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/TryableNullableNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/TryableNullableNodes.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/TryableNullableNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/TryableNullableNodes.java index d6d780543..fbeb0b258 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/tryable_nullable/TryableNullableNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/TryableNullableNodes.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.tryable_nullable; +package com.rawlabs.snapi.truffle.runtime.tryable_nullable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.ErrorObject; -import raw.runtime.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; public class TryableNullableNodes { @NodeInfo(shortName = "TryableNodes.IsNull") diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/IOUtils.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java similarity index 87% rename from snapi-truffle/src/main/java/raw/runtime/truffle/utils/IOUtils.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java index 7b73e34a5..0016c813a 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/IOUtils.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.utils; +package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.utils.core.RawSettings; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.utils.RawSettings; public class IOUtils { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/KryoFootPrint.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/utils/KryoFootPrint.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java index ba03e7b92..9884f0a87 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/KryoFootPrint.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.utils; +package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import raw.compiler.rql2.source.*; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; import scala.collection.immutable.Vector; public class KryoFootPrint { diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/RawTruffleCharStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleCharStream.java similarity index 91% rename from snapi-truffle/src/main/java/raw/runtime/truffle/utils/RawTruffleCharStream.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleCharStream.java index 906c3aff2..6be9b34fb 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/RawTruffleCharStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleCharStream.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.utils; +package com.rawlabs.snapi.truffle.runtime.utils; import java.io.Reader; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/RawTruffleStringCharStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleStringCharStream.java similarity index 93% rename from snapi-truffle/src/main/java/raw/runtime/truffle/utils/RawTruffleStringCharStream.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleStringCharStream.java index a0886254d..c0e122db0 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/RawTruffleStringCharStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleStringCharStream.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.utils; +package com.rawlabs.snapi.truffle.runtime.utils; import java.io.Reader; import java.io.StringReader; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/TruffleCharInputStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java similarity index 95% rename from snapi-truffle/src/main/java/raw/runtime/truffle/utils/TruffleCharInputStream.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java index 6d21f23b9..4fc3da1a7 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/TruffleCharInputStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.utils; +package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import java.io.Reader; diff --git a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/TruffleInputStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java similarity index 85% rename from snapi-truffle/src/main/java/raw/runtime/truffle/utils/TruffleInputStream.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java index 326a1add0..6c9c9b139 100644 --- a/snapi-truffle/src/main/java/raw/runtime/truffle/utils/TruffleInputStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package raw.runtime.truffle.utils; +package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; +import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.utils.core.RawException; +import com.rawlabs.utils.sources.api.Encoding; +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation; import java.io.InputStream; import java.io.Reader; -import raw.runtime.truffle.runtime.exceptions.RawTruffleRuntimeException; -import raw.runtime.truffle.runtime.primitives.LocationObject; -import raw.sources.api.Encoding; -import raw.sources.bytestream.api.ByteStreamLocation; -import raw.utils.RawException; import scala.util.Either; public class TruffleInputStream { diff --git a/snapi-truffle/src/main/java/module-info.java b/snapi-truffle/src/main/java/module-info.java index 1adb3e554..03fbd6f7f 100644 --- a/snapi-truffle/src/main/java/module-info.java +++ b/snapi-truffle/src/main/java/module-info.java @@ -10,7 +10,8 @@ * licenses/APL.txt. */ -import raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationFromStringEntry; +import com.rawlabs.compiler.CompilerServiceBuilder; +import com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationFromStringEntry; module raw.snapi.truffle { // Direct dependencies @@ -25,10 +26,10 @@ requires java.sql; requires scala.library; requires com.ctc.wstx; - requires raw.utils; - requires raw.protocol; - requires raw.client; - requires raw.sources; + requires raw.utils.core; + requires raw.protocol.compiler; + requires raw.compiler; + requires raw.utils.sources; requires raw.snapi.frontend; // Indirect dependencies @@ -52,344 +53,426 @@ requires com.google.common; requires jul.to.slf4j; - uses raw.compiler.rql2.api.EntryExtension; - uses raw.compiler.rql2.api.PackageExtension; - uses raw.client.api.CompilerServiceBuilder; + uses com.rawlabs.snapi.frontend.rql2.api.EntryExtension; + uses com.rawlabs.snapi.frontend.rql2.api.PackageExtension; + uses CompilerServiceBuilder; provides com.oracle.truffle.api.provider.TruffleLanguageProvider with - raw.runtime.truffle.RawLanguageProvider; - provides raw.compiler.rql2.api.EntryExtension with - raw.compiler.snapi.truffle.builtin.aws_extension.TruffleAwsV4SignedRequestEntry, - raw.compiler.snapi.truffle.builtin.byte_extension.TruffleByteFromEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleEmptyCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleBuildCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFilterCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleOrderByCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTransformCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleDistinctCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleCountCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTupleAvgCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMinCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMaxCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleSumCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFirstCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleLastCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTakeCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleUnnestCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFromCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleGroupCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleInternalJoinCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension + com.rawlabs.snapi.truffle.runtime.RawLanguageProvider; + provides com.rawlabs.snapi.frontend.rql2.api.EntryExtension with + com.rawlabs.snapi.truffle.emitter.builtin.aws_extension.TruffleAwsV4SignedRequestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.byte_extension.TruffleByteFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleEmptyCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleBuildCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFilterCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleOrderByCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension + .TruffleTransformCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleDistinctCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleCountCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTupleAvgCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMinCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMaxCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleSumCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFirstCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleLastCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTakeCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnnestCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFromCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleGroupCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension + .TruffleInternalJoinCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension .TruffleInternalEquiJoinCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleUnionCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleExistsCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleZipCollectionEntry, - raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMkStringCollectionEntry, - raw.compiler.snapi.truffle.builtin.csv_extension.TruffleCsvReadEntry, - raw.compiler.snapi.truffle.builtin.csv_extension.TruffleCsvParseEntry, - raw.compiler.snapi.truffle.builtin.decimal_extension.TruffleDecimalFromEntry, - raw.compiler.snapi.truffle.builtin.double_extension.TruffleDoubleFromEntry, - raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentParameterEntry, - raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorBuildEntry, - raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorBuildWithTypeEntry, - raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorGetEntry, - raw.compiler.snapi.truffle.builtin.float_extension.TruffleFloatFromEntry, - raw.compiler.snapi.truffle.builtin.function_extension.TruffleFunctionInvokeAfterEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleBuildIntervalEntry, - raw.compiler.snapi.truffle.builtin.int_extension.TruffleIntFromEntry, - raw.compiler.snapi.truffle.builtin.int_extension.TruffleIntRangeEntry, - raw.compiler.snapi.truffle.builtin.json_extension.TruffleReadJsonEntry, - raw.compiler.snapi.truffle.builtin.json_extension.TruffleParseJsonEntry, - raw.compiler.snapi.truffle.builtin.json_extension.TrufflePrintJsonEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleEmptyListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleBuildListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleGetListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleFilterListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleTransformListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleTakeListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleSumListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleMaxListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleMinListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleFirstListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleLastListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleCountListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleFromListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleUnsafeFromListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleGroupListEntry, - raw.compiler.snapi.truffle.builtin.list_extension.TruffleExistsListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnionCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleExistsCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleZipCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMkStringCollectionEntry, + com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvReadEntry, + com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvParseEntry, + com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.double_extension.TruffleDoubleFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.environment_extension + .TruffleEnvironmentParameterEntry, + com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildWithTypeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorGetEntry, + com.rawlabs.snapi.truffle.emitter.builtin.float_extension.TruffleFloatFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.function_extension.TruffleFunctionInvokeAfterEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleBuildIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntRangeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleReadJsonEntry, + com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleParseJsonEntry, + com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TrufflePrintJsonEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleEmptyListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleBuildListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGetListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFilterListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTransformListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTakeListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleSumListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMaxListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMinListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFirstListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleLastListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleCountListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFromListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleUnsafeFromListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGroupListEntry, + com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleExistsListEntry, TruffleLocationFromStringEntry, - raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationDescribeEntry, - raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationLsEntry, - raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationLlEntry, - raw.compiler.snapi.truffle.builtin.long_extension.TruffleLongFromEntry, - raw.compiler.snapi.truffle.builtin.long_extension.TruffleLongRangeEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAbsEntry, - raw.compiler.snapi.truffle.builtin.mysql_extension.TruffleMySQLQueryEntry, - raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableEmptyEntry, - raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableBuildEntry, - raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableIsNullEntry, - raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableUnsafeGetEntry, - raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableTransformEntry, - raw.compiler.snapi.truffle.builtin.nullable_tryable_extension + com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationDescribeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLlEntry, + com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongRangeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAbsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension.TruffleMySQLQueryEntry, + com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableEmptyEntry, + com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableIsNullEntry, + com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableUnsafeGetEntry, + com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableTransformEntry, + com.rawlabs.snapi.truffle.emitter.builtin.nullable_tryable_extension .TruffleFlatMapNullableTryableEntry, - raw.compiler.snapi.truffle.builtin.oracle_extension.TruffleOracleQueryEntry, - raw.compiler.snapi.truffle.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry, - raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordBuildEntry, - raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordConcatEntry, - raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordFieldsEntry, - raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordAddFieldEntry, - raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordRemoveFieldEntry, - raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordGetFieldByIndexEntry, - raw.compiler.snapi.truffle.builtin.snowflake_extension.TruffleSnowflakeQueryEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateBuildEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateFromEpochDayEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateFromTimestampEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateParseEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateNowEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateYearEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateMonthEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateDayEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateSubtractEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateAddIntervalEntry, - raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateSubtractIntervalEntry, - raw.compiler.snapi.truffle.builtin.decimal_extension.TruffleDecimalRoundEntry, - raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentSecretEntry, - raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentScopesEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalToMillisEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalFromMillisEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalParseEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalYearsEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMonthsEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalWeeksEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalDaysEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalHoursEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMinutesEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalSecondsEntry, - raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMillisEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathPiEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathRandomEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathPowerEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAtn2Entry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAcosEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAsinEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAtanEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCeilingEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCosEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCotEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathDegreesEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathExpEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathLogEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathLog10Entry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathRadiansEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSignEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSinEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSqrtEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathTanEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSquareEntry, - raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathFloorEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpReadEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpGetEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPostEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPutEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpDeleteEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpHeadEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPatchEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpOptionsEntry, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpUrlEncode, - raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpUrlDecode, - raw.compiler.snapi.truffle.builtin.xml_extension.TruffleReadXmlEntry, - raw.compiler.snapi.truffle.builtin.xml_extension.TruffleParseXmlEntry, - raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeCastEntry, - raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeEmptyEntry, - raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeMatchEntry, - raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeProtectCastEntry, - raw.compiler.snapi.truffle.builtin.binary_extension.TruffleBinaryBase64Entry, - raw.compiler.snapi.truffle.builtin.binary_extension.TruffleBinaryReadEntry, - raw.compiler.snapi.truffle.builtin.binary_extension.TruffleFromStringBinaryEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampBuildEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampFromDateEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampParseEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampNowEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampRangeEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampYearEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMonthEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampDayEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampHourEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMinuteEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSecondEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMillisEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampFromUnixTimestampEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampToUnixTimestampEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSubtractEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampAddIntervalEntry, - raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSubtractIntervalEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeBuildEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeParseEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeNowEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeHourEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeMinuteEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSecondEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeMillisEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSubtractEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeAddIntervalEntry, - raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSubtractIntervalEntry, - raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryFlatMapEntry, - raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryUnsafeGetEntry, - raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryIsErrorEntry, - raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryIsSuccessEntry, - raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryTransformEntry, - raw.compiler.snapi.truffle.builtin.success_extension.TruffleSuccessBuildEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringFromEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReadEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringContainsEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringTrimEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLTrimEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringRTrimEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReplaceEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReverseEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReplicateEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringUpperEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLowerEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringSplitEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLengthEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringSubStringEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringCountSubStringEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringStartsWithEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringEmptyEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleBase64EntryExtension, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringEncodeEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringDecodeEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLevenshteinDistanceEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReadLinesEntry, - raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringCapitalizeEntry, - raw.compiler.snapi.truffle.builtin.sqlserver_extension.TruffleSQLServerQueryEntry, - raw.compiler.snapi.truffle.builtin.short_extension.TruffleShortFromEntry, - raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexReplaceEntry, - raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexMatchesEntry, - raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexFirstMatchInEntry, - raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexGroupsEntry, - raw.compiler.snapi.truffle.builtin.s3_extension.TruffleS3BuildEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleByteValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleBoolValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleDateValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleDoubleValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleFloatValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleIntervalValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleIntValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleListValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleLongValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleMandatoryExpArgsEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleMandatoryValueArgsEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleOptionalExpArgsTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleOptionalValueArgsTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleRecordValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleShortValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleStrictArgsColPassThroughTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleStrictArgsTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleStringValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleTimestampValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleTimeValueArgTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarExpArgsTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarNullableStringExpTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarNullableStringValueTestEntry, - raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarValueArgsTestEntry, - raw.compiler.snapi.truffle.builtin.kryo_extension.TruffleKryoDecodeEntry, - raw.compiler.snapi.truffle.builtin.kryo_extension.TruffleKryoEncodeEntry; + com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension.TruffleOracleQueryEntry, + com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry, + com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordConcatEntry, + com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordFieldsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordAddFieldEntry, + com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordRemoveFieldEntry, + com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordGetFieldByIndexEntry, + com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension.TruffleSnowflakeQueryEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromEpochDayEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromTimestampEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateParseEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateNowEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateYearEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateMonthEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateDayEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateAddIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalRoundEntry, + com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentSecretEntry, + com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentScopesEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalToMillisEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalFromMillisEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalParseEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalYearsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMonthsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalWeeksEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalDaysEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalHoursEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMinutesEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalSecondsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMillisEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPiEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRandomEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPowerEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtn2Entry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAcosEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAsinEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtanEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCeilingEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCosEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCotEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathDegreesEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathExpEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLogEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLog10Entry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRadiansEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSignEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSinEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSqrtEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathTanEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSquareEntry, + com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathFloorEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpReadEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpGetEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPostEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPutEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpDeleteEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpHeadEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPatchEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpOptionsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlEncode, + com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlDecode, + com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleReadXmlEntry, + com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleParseXmlEntry, + com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeCastEntry, + com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeEmptyEntry, + com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeMatchEntry, + com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeProtectCastEntry, + com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryBase64Entry, + com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryReadEntry, + com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleFromStringBinaryEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampFromDateEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampParseEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampNowEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampRangeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampYearEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMonthEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampDayEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampHourEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMinuteEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSecondEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMillisEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension + .TruffleTimestampFromUnixTimestampEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension + .TruffleTimestampToUnixTimestampEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSubtractEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension + .TruffleTimestampAddIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension + .TruffleTimestampSubtractIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeParseEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeNowEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeHourEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMinuteEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSecondEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMillisEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeAddIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractIntervalEntry, + com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryFlatMapEntry, + com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryUnsafeGetEntry, + com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsErrorEntry, + com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsSuccessEntry, + com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryTransformEntry, + com.rawlabs.snapi.truffle.emitter.builtin.success_extension.TruffleSuccessBuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringContainsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringTrimEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLTrimEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringRTrimEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplaceEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReverseEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplicateEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringUpperEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLowerEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSplitEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLengthEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSubStringEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCountSubStringEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringStartsWithEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEmptyEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleBase64EntryExtension, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEncodeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringDecodeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension + .TruffleStringLevenshteinDistanceEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadLinesEntry, + com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCapitalizeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension.TruffleSQLServerQueryEntry, + com.rawlabs.snapi.truffle.emitter.builtin.short_extension.TruffleShortFromEntry, + com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexReplaceEntry, + com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexMatchesEntry, + com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexFirstMatchInEntry, + com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexGroupsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.s3_extension.TruffleS3BuildEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleByteValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleBoolValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleDateValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleDoubleValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleFloatValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleIntervalValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleIntValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleListValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleLongValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleMandatoryExpArgsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleMandatoryValueArgsEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleOptionalExpArgsTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleOptionalValueArgsTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleRecordValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleShortValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension + .TruffleStrictArgsColPassThroughTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStrictArgsTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStringValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleTimestampValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleTimeValueArgTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarExpArgsTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarNullableStringExpTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension + .TruffleVarNullableStringValueTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarValueArgsTestEntry, + com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension.TruffleKryoDecodeEntry, + com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension.TruffleKryoEncodeEntry; - exports raw.runtime.truffle; - exports raw.runtime.truffle.boundary; - exports raw.runtime.truffle.runtime.record; - exports raw.runtime.truffle.runtime.operators; - exports raw.runtime.truffle.runtime.function; - exports raw.runtime.truffle.runtime.exceptions; - exports raw.runtime.truffle.runtime.exceptions.xml; - exports raw.runtime.truffle.runtime.exceptions.json; - exports raw.runtime.truffle.runtime.exceptions.csv; - exports raw.runtime.truffle.runtime.exceptions.binary; - exports raw.runtime.truffle.runtime.exceptions.rdbms; - exports raw.runtime.truffle.runtime.data_structures.treemap; - exports raw.runtime.truffle.runtime.primitives; - exports raw.runtime.truffle.runtime.list; - exports raw.runtime.truffle.runtime.or; - exports raw.runtime.truffle.runtime.generator.list; - exports raw.runtime.truffle.runtime.generator.collection; - exports raw.runtime.truffle.runtime.generator.collection.abstract_generator; - exports raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next; - exports raw.runtime.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; - exports raw.runtime + exports com.rawlabs.snapi.truffle.runtime; + exports com.rawlabs.snapi.truffle.runtime.boundary; + exports com.rawlabs.snapi.truffle.runtime.runtime.record; + exports com.rawlabs.snapi.truffle.runtime.runtime.operators; + exports com.rawlabs.snapi.truffle.runtime.runtime.function; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.binary; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; + exports com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; + exports com.rawlabs.snapi.truffle.runtime.runtime.primitives; + exports com.rawlabs.snapi.truffle.runtime.runtime.list; + exports com.rawlabs.snapi.truffle.runtime.runtime.or; + exports com.rawlabs.snapi.truffle.runtime.runtime.generator.list; + exports com.rawlabs.snapi.truffle.runtime.runtime.generator.collection; + exports com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator; + exports com.rawlabs + .snapi .truffle .runtime + .runtime + .generator + .collection + .abstract_generator + .compute_next; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .abstract_generator + .compute_next + .sources; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime .generator .collection .abstract_generator .compute_next .operations; - exports raw.runtime.truffle.runtime.generator.collection.off_heap_generator.record_shaper; - exports raw.runtime.truffle.runtime.generator.collection.off_heap_generator.input_buffer; - exports raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap; - exports raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; - exports raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; - exports raw.runtime.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; - exports raw.runtime.truffle.runtime.iterable; - exports raw.runtime.truffle.runtime.iterable.operations; - exports raw.runtime.truffle.runtime.iterable.list; - exports raw.runtime.truffle.runtime.iterable.sources; - exports raw.runtime.truffle.runtime.kryo; - exports raw.runtime.truffle.utils; - exports raw.runtime.truffle.tryable_nullable; - exports raw.runtime.truffle.ast; - exports raw.runtime.truffle.ast.io.kryo; - exports raw.runtime.truffle.ast.io.xml.parser; - exports raw.runtime.truffle.ast.io.jdbc; - exports raw.runtime.truffle.ast.io.json.reader; - exports raw.runtime.truffle.ast.io.json.reader.parser; - exports raw.runtime.truffle.ast.io.json.writer; - exports raw.runtime.truffle.ast.io.json.writer.internal; - exports raw.runtime.truffle.ast.io.csv.reader; - exports raw.runtime.truffle.ast.io.csv.reader.parser; - exports raw.runtime.truffle.ast.io.csv.writer; - exports raw.runtime.truffle.ast.io.csv.writer.internal; - exports raw.runtime.truffle.ast.io.binary; - exports raw.runtime.truffle.ast.local; - exports raw.runtime.truffle.ast.expressions.unary; - exports raw.runtime.truffle.ast.expressions.iterable; - exports raw.runtime.truffle.ast.expressions.iterable.collection; - exports raw.runtime.truffle.ast.expressions.iterable.list; - exports raw.runtime.truffle.ast.expressions.record; - exports raw.runtime.truffle.ast.expressions.option; - exports raw.runtime.truffle.ast.expressions.function; - exports raw.runtime.truffle.ast.expressions.tryable; - exports raw.runtime.truffle.ast.expressions.binary; - exports raw.runtime.truffle.ast.expressions.literals; - exports raw.runtime.truffle.ast.expressions.builtin.regex_package; - exports raw.runtime.truffle.ast.expressions.builtin.type_package; - exports raw.runtime.truffle.ast.expressions.builtin.environment_package; - exports raw.runtime.truffle.ast.expressions.builtin.math_package; - exports raw.runtime.truffle.ast.expressions.builtin.aws_package; - exports raw.runtime.truffle.ast.expressions.builtin.http_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.short_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.double_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.long_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.decimal_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.float_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.int_package; - exports raw.runtime.truffle.ast.expressions.builtin.numeric.byte_package; - exports raw.runtime.truffle.ast.expressions.builtin.function_package; - exports raw.runtime.truffle.ast.expressions.builtin.temporals; - exports raw.runtime.truffle.ast.expressions.builtin.temporals.date_package; - exports raw.runtime.truffle.ast.expressions.builtin.temporals.time_package; - exports raw.runtime.truffle.ast.expressions.builtin.temporals.interval_package; - exports raw.runtime.truffle.ast.expressions.builtin.temporals.timestamp_package; - exports raw.runtime.truffle.ast.expressions.builtin.string_package; - exports raw.runtime.truffle.ast.expressions.builtin.location_package; - exports raw.runtime.truffle.ast.expressions.builtin.binary_package; - exports raw.runtime.truffle.ast.expressions.aggregation; - exports raw.runtime.truffle.ast.controlflow; - exports raw.runtime.truffle.ast.osr; - exports raw.runtime.truffle.ast.osr.bodies; - exports raw.runtime.truffle.ast.osr.conditions; - exports raw.runtime.truffle.runtime.exceptions.validation; - exports raw.compiler.snapi.truffle.compiler; - exports raw.compiler.rql2output.truffle.builtin; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .off_heap_generator + .record_shaper; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .off_heap_generator + .input_buffer; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .off_heap_generator + .off_heap; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .off_heap_generator + .off_heap + .group_by; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .off_heap_generator + .off_heap + .order_by; + exports com.rawlabs + .snapi + .truffle + .runtime + .runtime + .generator + .collection + .off_heap_generator + .off_heap + .distinct; + exports com.rawlabs.snapi.truffle.runtime.runtime.iterable; + exports com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; + exports com.rawlabs.snapi.truffle.runtime.runtime.iterable.list; + exports com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; + exports com.rawlabs.snapi.truffle.runtime.runtime.kryo; + exports com.rawlabs.snapi.truffle.runtime.utils; + exports com.rawlabs.snapi.truffle.runtime.tryable_nullable; + exports com.rawlabs.snapi.truffle.runtime.ast; + exports com.rawlabs.snapi.truffle.runtime.ast.io.kryo; + exports com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; + exports com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; + exports com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; + exports com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; + exports com.rawlabs.snapi.truffle.runtime.ast.io.json.writer; + exports com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; + exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader; + exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; + exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer; + exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; + exports com.rawlabs.snapi.truffle.runtime.ast.io.binary; + exports com.rawlabs.snapi.truffle.runtime.ast.local; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.record; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.option; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.function; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.aws_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.short_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.double_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.byte_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.function_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; + exports com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; + exports com.rawlabs.snapi.truffle.runtime.ast.controlflow; + exports com.rawlabs.snapi.truffle.runtime.ast.osr; + exports com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; + exports com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; + exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; + exports com.rawlabs.snapi.truffle.emitter.compiler; + exports com.rawlabs.snapi.truffle.emitter.output; + exports com.rawlabs.snapi.truffle.emitter.builtin; + exports com.rawlabs.snapi.truffle.emitter; } diff --git a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SnapiTruffleEmitter.java b/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SnapiTruffleEmitter.java deleted file mode 100644 index f0778b82d..000000000 --- a/snapi-truffle/src/main/java/raw/compiler/snapi/truffle/compiler/SnapiTruffleEmitter.java +++ /dev/null @@ -1,659 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.compiler.snapi.truffle.compiler; - -import java.util.*; - -import com.oracle.truffle.api.RootCallTarget; -import com.oracle.truffle.api.frame.FrameDescriptor; -import com.oracle.truffle.api.frame.FrameSlotKind; -import org.bitbucket.inkytonik.kiama.relation.TreeRelation; -import org.bitbucket.inkytonik.kiama.util.Entity; -import raw.compiler.base.source.Type; -import raw.compiler.common.source.Exp; -import raw.compiler.common.source.IdnExp; -import raw.compiler.common.source.SourceNode; -import raw.compiler.rql2.*; -import raw.compiler.rql2.api.EntryExtension; -import raw.compiler.rql2.api.Rql2Arg; -import raw.compiler.rql2.source.*; -import raw.compiler.snapi.truffle.TruffleEmitter; -import raw.compiler.snapi.truffle.TruffleEntryExtension; -import raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationFromStringEntry; -import raw.runtime.truffle.ExpressionNode; -import raw.runtime.truffle.RawLanguage; -import raw.runtime.truffle.StatementNode; -import raw.runtime.truffle.ast.ProgramExpressionNode; -import raw.runtime.truffle.ast.controlflow.ExpBlockNode; -import raw.runtime.truffle.ast.controlflow.IfThenElseNode; -import raw.runtime.truffle.ast.expressions.binary.*; -import raw.runtime.truffle.ast.expressions.binary.DivNodeGen; -import raw.runtime.truffle.ast.expressions.binary.ModNodeGen; -import raw.runtime.truffle.ast.expressions.binary.MultNodeGen; -import raw.runtime.truffle.ast.expressions.binary.SubNodeGen; -import raw.runtime.truffle.ast.expressions.function.*; -import raw.runtime.truffle.ast.expressions.literals.*; -import raw.runtime.truffle.ast.expressions.option.OptionNoneNode; -import raw.runtime.truffle.ast.expressions.record.RecordProjNodeGen; -import raw.runtime.truffle.ast.expressions.unary.NegNodeGen; -import raw.runtime.truffle.ast.expressions.unary.NotNodeGen; -import raw.runtime.truffle.ast.local.*; -import raw.runtime.truffle.ast.local.ReadClosureVariableNodeGen; -import raw.runtime.truffle.ast.local.ReadLocalVariableNodeGen; -import raw.runtime.truffle.ast.local.WriteLocalVariableNodeGen; -import raw.runtime.truffle.runtime.exceptions.RawTruffleInternalErrorException; -import raw.runtime.truffle.runtime.function.Function; -import scala.collection.JavaConverters; - -public class SnapiTruffleEmitter extends TruffleEmitter { - - private final Tree tree; - private final RawLanguage rawLanguage; - private final ProgramContext programContext; - private final SemanticAnalyzer analyzer; - private final String uniqueId = UUID.randomUUID().toString().replace("-", "").replace("_", ""); - private int idnCounter = 0; - private final HashMap idnSlot = new HashMap<>(); - private final List> slotMapScope = new LinkedList<>(); - private final List frameDescriptorBuilderScope = new LinkedList<>(); - - private int funcCounter = 0; - private final HashMap funcMap = new HashMap<>(); - private final HashMap entityDepth = new HashMap<>(); - - private static final EntryExtension[] entries = { - new raw.compiler.snapi.truffle.builtin.aws_extension.TruffleAwsV4SignedRequestEntry(), - new raw.compiler.snapi.truffle.builtin.byte_extension.TruffleByteFromEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleEmptyCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleBuildCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFilterCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleOrderByCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTransformCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleDistinctCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleCountCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTupleAvgCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMinCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMaxCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleSumCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFirstCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleLastCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTakeCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleUnnestCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFromCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleGroupCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleInternalJoinCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleInternalEquiJoinCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleUnionCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleExistsCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleZipCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMkStringCollectionEntry(), - new raw.compiler.snapi.truffle.builtin.csv_extension.TruffleCsvReadEntry(), - new raw.compiler.snapi.truffle.builtin.csv_extension.TruffleCsvParseEntry(), - new raw.compiler.snapi.truffle.builtin.decimal_extension.TruffleDecimalFromEntry(), - new raw.compiler.snapi.truffle.builtin.double_extension.TruffleDoubleFromEntry(), - new raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentParameterEntry(), - new raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorBuildEntry(), - new raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorBuildWithTypeEntry(), - new raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorGetEntry(), - new raw.compiler.snapi.truffle.builtin.float_extension.TruffleFloatFromEntry(), - new raw.compiler.snapi.truffle.builtin.function_extension.TruffleFunctionInvokeAfterEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleBuildIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.int_extension.TruffleIntFromEntry(), - new raw.compiler.snapi.truffle.builtin.int_extension.TruffleIntRangeEntry(), - new raw.compiler.snapi.truffle.builtin.json_extension.TruffleReadJsonEntry(), - new raw.compiler.snapi.truffle.builtin.json_extension.TruffleParseJsonEntry(), - new raw.compiler.snapi.truffle.builtin.json_extension.TrufflePrintJsonEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleEmptyListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleBuildListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleGetListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleFilterListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleTransformListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleTakeListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleSumListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleMaxListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleMinListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleFirstListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleLastListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleCountListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleFromListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleUnsafeFromListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleGroupListEntry(), - new raw.compiler.snapi.truffle.builtin.list_extension.TruffleExistsListEntry(), - new TruffleLocationFromStringEntry(), - new raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationDescribeEntry(), - new raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationLsEntry(), - new raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationLlEntry(), - new raw.compiler.snapi.truffle.builtin.long_extension.TruffleLongFromEntry(), - new raw.compiler.snapi.truffle.builtin.long_extension.TruffleLongRangeEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAbsEntry(), - new raw.compiler.snapi.truffle.builtin.mysql_extension.TruffleMySQLQueryEntry(), - new raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableEmptyEntry(), - new raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableBuildEntry(), - new raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableIsNullEntry(), - new raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableUnsafeGetEntry(), - new raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableTransformEntry(), - new raw.compiler.snapi.truffle.builtin.nullable_tryable_extension.TruffleFlatMapNullableTryableEntry(), - new raw.compiler.snapi.truffle.builtin.oracle_extension.TruffleOracleQueryEntry(), - new raw.compiler.snapi.truffle.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry(), - new raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordBuildEntry(), - new raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordConcatEntry(), - new raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordFieldsEntry(), - new raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordAddFieldEntry(), - new raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordRemoveFieldEntry(), - new raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordGetFieldByIndexEntry(), - new raw.compiler.snapi.truffle.builtin.snowflake_extension.TruffleSnowflakeQueryEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateBuildEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateFromEpochDayEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateFromTimestampEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateParseEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateNowEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateYearEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateMonthEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateDayEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateSubtractEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateAddIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateSubtractIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.decimal_extension.TruffleDecimalRoundEntry(), - new raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentSecretEntry(), - new raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentScopesEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalToMillisEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalFromMillisEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalParseEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalYearsEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMonthsEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalWeeksEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalDaysEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalHoursEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMinutesEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalSecondsEntry(), - new raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMillisEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathPiEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathRandomEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathPowerEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAtn2Entry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAcosEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAsinEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAtanEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCeilingEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCosEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCotEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathDegreesEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathExpEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathLogEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathLog10Entry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathRadiansEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSignEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSinEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSqrtEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathTanEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSquareEntry(), - new raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathFloorEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpReadEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpGetEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPostEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPutEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpDeleteEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpHeadEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPatchEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpOptionsEntry(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpUrlEncode(), - new raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpUrlDecode(), - new raw.compiler.snapi.truffle.builtin.xml_extension.TruffleReadXmlEntry(), - new raw.compiler.snapi.truffle.builtin.xml_extension.TruffleParseXmlEntry(), - new raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeCastEntry(), - new raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeEmptyEntry(), - new raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeMatchEntry(), - new raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeProtectCastEntry(), - new raw.compiler.snapi.truffle.builtin.binary_extension.TruffleBinaryBase64Entry(), - new raw.compiler.snapi.truffle.builtin.binary_extension.TruffleBinaryReadEntry(), - new raw.compiler.snapi.truffle.builtin.binary_extension.TruffleFromStringBinaryEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampBuildEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampFromDateEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampParseEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampNowEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampRangeEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampYearEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMonthEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampDayEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampHourEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMinuteEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSecondEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMillisEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampFromUnixTimestampEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampToUnixTimestampEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSubtractEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampAddIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSubtractIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeBuildEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeParseEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeNowEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeHourEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeMinuteEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSecondEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeMillisEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSubtractEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeAddIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSubtractIntervalEntry(), - new raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryFlatMapEntry(), - new raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryUnsafeGetEntry(), - new raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryIsErrorEntry(), - new raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryIsSuccessEntry(), - new raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryTransformEntry(), - new raw.compiler.snapi.truffle.builtin.success_extension.TruffleSuccessBuildEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringFromEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReadEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringContainsEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringTrimEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLTrimEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringRTrimEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReplaceEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReverseEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReplicateEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringUpperEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLowerEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringSplitEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLengthEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringSubStringEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringCountSubStringEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringStartsWithEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringEmptyEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleBase64EntryExtension(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringEncodeEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringDecodeEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLevenshteinDistanceEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReadLinesEntry(), - new raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringCapitalizeEntry(), - new raw.compiler.snapi.truffle.builtin.sqlserver_extension.TruffleSQLServerQueryEntry(), - new raw.compiler.snapi.truffle.builtin.short_extension.TruffleShortFromEntry(), - new raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexReplaceEntry(), - new raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexMatchesEntry(), - new raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexFirstMatchInEntry(), - new raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexGroupsEntry(), - new raw.compiler.snapi.truffle.builtin.s3_extension.TruffleS3BuildEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleByteValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleBoolValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleDateValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleDoubleValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleFloatValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleIntervalValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleIntValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleListValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleLongValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleMandatoryExpArgsEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleMandatoryValueArgsEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleOptionalExpArgsTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleOptionalValueArgsTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleRecordValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleShortValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleStrictArgsColPassThroughTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleStrictArgsTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleStringValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleTimestampValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleTimeValueArgTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarExpArgsTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarNullableStringExpTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarNullableStringValueTestEntry(), - new raw.compiler.snapi.truffle.builtin.test_extension.TruffleVarValueArgsTestEntry(), - new raw.compiler.snapi.truffle.builtin.kryo_extension.TruffleKryoDecodeEntry(), - new raw.compiler.snapi.truffle.builtin.kryo_extension.TruffleKryoEncodeEntry() - }; - - private static TruffleEntryExtension getEntry(String pkgName, String entName) { - for (EntryExtension entry : entries) { - if (entry.packageName().equals(pkgName) && entry.entryName().equals(entName)) { - return (TruffleEntryExtension) entry; - } - } - throw new RawTruffleInternalErrorException("Could not find entry for " + pkgName + "." + entName); - } - - public SnapiTruffleEmitter(Tree tree, RawLanguage rawLanguage, ProgramContext programContext) { - this.tree = tree; - this.analyzer = tree.analyzer(); - this.rawLanguage = rawLanguage; - this.programContext = programContext; - } - - private Type tipe(Exp e) { - return analyzer.tipe(e); - } - - public RawLanguage getLanguage() { - return this.rawLanguage; - } - - private int getCurrentDepth() { - return slotMapScope.size(); - } - - private void setEntityDepth(Entity e) { - entityDepth.put(e, getCurrentDepth()); - } - - private int getEntityDepth(Entity e) { - return entityDepth.get(e); - } - - private String getIdnName(Entity entity) { - return idnSlot.putIfAbsent(entity, String.format("idn%s_%d", uniqueId, ++idnCounter)); - } - - protected void addScope() { - slotMapScope.add(0, new HashMap<>()); - frameDescriptorBuilderScope.add(0, FrameDescriptor.newBuilder()); - } - - protected FrameDescriptor dropScope() { - slotMapScope.remove(0); - FrameDescriptor.Builder frameDescriptorBuilder = frameDescriptorBuilderScope.remove(0); - return frameDescriptorBuilder.build(); - } - - public FrameDescriptor.Builder getFrameDescriptorBuilder() { - return frameDescriptorBuilderScope.get(0); - } - - private void addSlot(Entity entity, String slot) { - slotMapScope.get(0).put(entity, slot); - } - - protected StatementNode emitMethod(Rql2Method m) { - Entity entity = analyzer.entity().apply(m.i()); - FunProto fp = m.p(); - Function f = recurseFunProto(fp); - ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(fp.ps()).stream() - .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) - .toArray(ExpressionNode[]::new); - ExpressionNode node; - boolean hasFreeVars = analyzer.freeVars(m).nonEmpty(); - node = new MethodNode(m.i().idn(), f, defaultArgs, hasFreeVars); - int slot = getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - addSlot(entity, Integer.toString(slot)); - return WriteLocalVariableNodeGen.create(node, slot, null); - } - - private SlotLocation findSlot(Entity entity) { - for (int depth = 0; ; depth++) { - HashMap curSlot = slotMapScope.get(depth); - String slot = curSlot.get(entity); - if (slot != null) { - return new SlotLocation(depth, Integer.parseInt(slot)); - } - } - } - - private String getFuncIdn(Entity entity) { - return funcMap.putIfAbsent(entity, String.format("func%s_%d", uniqueId, ++funcCounter)); - } - - private String getLambdaFuncIdn() { - return String.format("func%s_%d", uniqueId, ++funcCounter); - } - - private StatementNode recurseLetDecl(LetDecl ld) { - return switch (ld) { - case LetBind lb -> { - Entity entity = analyzer.entity().apply(lb.i()); - Rql2Type rql2Type = (Rql2Type) tipe(lb.e()); - int slot = switch (rql2Type) { - case Rql2UndefinedType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case ExpType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2ByteType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Byte, getIdnName(entity), null); - case Rql2ShortType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Int, getIdnName(entity), null); - case Rql2IntType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Int, getIdnName(entity), null); - case Rql2LongType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Long, getIdnName(entity), null); - case Rql2FloatType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Float, getIdnName(entity), null); - case Rql2DoubleType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Double, getIdnName(entity), null); - case Rql2DecimalType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2BoolType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Boolean, getIdnName(entity), null); - case Rql2StringType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2DateType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2TimeType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2TimestampType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2IntervalType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2BinaryType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2IterableType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2ListType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case FunType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2RecordType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2LocationType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case PackageType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case PackageEntryType ignored -> - getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - default -> throw new RawTruffleInternalErrorException(); - }; - addSlot(entity, Integer.toString(slot)); - yield WriteLocalVariableNodeGen.create(recurseExp(lb.e()), slot, rql2Type); - } - case LetFun lf -> { - Entity entity = analyzer.entity().apply(lf.i()); - Function f = recurseFunProto(lf.p()); - boolean hasFreeVars = analyzer.freeVars(lf).nonEmpty(); - ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(lf.p().ps()).stream() - .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) - .toArray(ExpressionNode[]::new); - - ExpressionNode node; - // If the function has free variables it is a Closure - if (hasFreeVars) { - node = new ClosureNode(f, defaultArgs); - } - // If the function has optional arguments it is a Method - else { - node = new MethodNode(null, f, defaultArgs, hasFreeVars); - } - int slot = getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - addSlot(entity, Integer.toString(slot)); - yield WriteLocalVariableNodeGen.create(node, slot, null); - } - case LetFunRec lfr -> { - Entity entity = analyzer.entity().apply(lfr.i()); - int slot = getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - addSlot(entity, Integer.toString(slot)); - Function f = recurseFunProto(lfr.p()); - ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(lfr.p().ps()).stream() - .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) - .toArray(ExpressionNode[]::new); - RecClosureNode functionLiteralNode = new RecClosureNode(f, defaultArgs); - yield WriteLocalVariableNodeGen.create(functionLiteralNode, slot, null); - } - default -> throw new RawTruffleInternalErrorException(); - }; - } - - private Function recurseFunProto(FunProto fp) { - addScope(); - JavaConverters.asJavaCollection(fp.ps()) - .forEach(p -> setEntityDepth(analyzer.entity().apply(p.i()))); - - ExpressionNode functionBody = recurseExp(fp.b().e()); - FrameDescriptor funcFrameDescriptor = dropScope(); - - ProgramExpressionNode functionRootBody = - new ProgramExpressionNode(rawLanguage, funcFrameDescriptor, functionBody); - - RootCallTarget rootCallTarget = functionRootBody.getCallTarget(); - - String[] argNames = - JavaConverters.asJavaCollection(fp.ps()).stream() - .map(p -> p.i().idn()) - .toArray(String[]::new); - - return new Function(rootCallTarget, argNames); - } - - // Used only for tests at the moment - public ClosureNode recurseLambda(TruffleBuildBody truffleBuildBody) { - addScope(); - ExpressionNode functionBody = truffleBuildBody.buildBody(); - FrameDescriptor funcFrameDescriptor = dropScope(); - - ProgramExpressionNode functionRootBody = new ProgramExpressionNode(rawLanguage, funcFrameDescriptor, functionBody); - - RootCallTarget rootCallTarget = functionRootBody.getCallTarget(); - Function f = new Function(rootCallTarget, new String[]{"x"}); - return new ClosureNode(f, new ExpressionNode[]{null}); - } - - public ExpressionNode recurseExp(Exp in) { - return switch (in) { - case Exp ignored when tipe(in) instanceof PackageType || tipe(in) instanceof PackageEntryType -> - new ZeroedConstNode(Rql2ByteType.apply(new scala.collection.immutable.HashSet().seq())); - case TypeExp typeExp -> new ZeroedConstNode((Rql2Type) typeExp.t()); - case NullConst ignored -> new OptionNoneNode(); - case BoolConst v -> new BoolNode(v.value()); - case ByteConst v -> new ByteNode(v.value()); - case ShortConst v -> new ShortNode(v.value()); - case IntConst v -> new IntNode(v.value()); - case LongConst v -> new LongNode(v.value()); - case FloatConst v -> new FloatNode(v.value()); - case DoubleConst v -> new DoubleNode(v.value()); - case DecimalConst v -> new DecimalNode(v.value()); - case StringConst v -> new StringNode(v.value()); - case TripleQuotedStringConst v -> new StringNode(v.value()); - case BinaryExp be -> switch (be.binaryOp()) { - case And ignored -> new AndNode(recurseExp(be.left()), recurseExp(be.right())); - case Or ignored -> new OrNode(recurseExp(be.left()), recurseExp(be.right())); - case Plus ignored -> new PlusNode(recurseExp(be.left()), recurseExp(be.right())); - case Sub ignored -> SubNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); - case Mult ignored -> MultNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); - case Mod ignored -> ModNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); - case Div ignored -> DivNodeGen.create(recurseExp(be.left()), recurseExp(be.right())); - case Gt ignored -> new GtNode(recurseExp(be.left()), recurseExp(be.right())); - case Ge ignored -> new GeNode(recurseExp(be.left()), recurseExp(be.right())); - case Eq ignored -> new EqNode(recurseExp(be.left()), recurseExp(be.right())); - case Neq ignored -> NotNodeGen.create(new EqNode(recurseExp(be.left()), recurseExp(be.right()))); - case Lt ignored -> new LtNode(recurseExp(be.left()), recurseExp(be.right())); - case Le ignored -> new LeNode(recurseExp(be.left()), recurseExp(be.right())); - default -> throw new RawTruffleInternalErrorException(); - }; - case BinaryConst bc -> new BinaryConstNode(bc.bytes()); - case LocationConst lc -> new LocationConstNode(lc.bytes(), lc.publicDescription()); - case UnaryExp ue -> switch (ue.unaryOp()) { - case Neg ignored -> NegNodeGen.create(recurseExp(ue.exp())); - case Not ignored -> NotNodeGen.create(recurseExp(ue.exp())); - default -> throw new RawTruffleInternalErrorException(); - }; - case IdnExp ie -> { - Entity entity = analyzer.entity().apply(ie.idn()); - yield switch (entity) { - case MethodEntity b -> { - SlotLocation slotLocation = findSlot(b); - yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), null); - } - case LetBindEntity b -> { - SlotLocation slotLocation = findSlot(b); - yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), (Rql2Type) tipe(b.b().e())) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) tipe(b.b().e())); - } - case LetFunEntity f -> { - SlotLocation slotLocation = findSlot(f); - yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) analyzer.idnType(f.f().i())); - } - case LetFunRecEntity f -> { - SlotLocation slotLocation = findSlot(f); - yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) analyzer.idnType(f.f().i())); - } - case FunParamEntity f -> { - int depth = getCurrentDepth() - getEntityDepth(f); - if (depth == 0) { - TreeRelation p = tree.parent(); - FunProto fpr = (FunProto) JavaConverters.asJavaCollection(p.apply(f.f())) - .stream() - .filter(n -> n instanceof FunProto) - .findFirst() - .orElseThrow(); - List fp = JavaConverters.asJavaCollection(fpr.ps()).stream().map(fpar -> (FunParam) fpar).toList(); - int idx = fp.indexOf(f.f()); - yield new ReadParamNode(idx); - } else { - TreeRelation p = tree.parent(); - FunProto fpr = (FunProto) JavaConverters.asJavaCollection(p.apply(f.f())) - .stream() - .filter(n -> n instanceof FunProto) - .findFirst() - .orElseThrow(); - List fp = JavaConverters.asJavaCollection(fpr.ps()).stream().map(fpar -> (FunParam) fpar).toList(); - int idx = fp.indexOf(f.f()); - yield new ReadParamClosureNode(depth, idx); - } - } - default -> throw new RawTruffleInternalErrorException("Unknown entity type"); - }; - } - case IfThenElse ite -> new IfThenElseNode(recurseExp(ite.e1()), recurseExp(ite.e2()), recurseExp(ite.e3())); - case Proj proj -> RecordProjNodeGen.create(recurseExp(proj.e()), new StringNode(proj.i())); - case Let let -> { - StatementNode[] decls = JavaConverters.asJavaCollection(let.decls()).stream().map(this::recurseLetDecl).toArray(StatementNode[]::new); - yield new ExpBlockNode(decls, recurseExp(let.e())); - } - case FunAbs fa -> { - Function f = recurseFunProto(fa.p()); - boolean hasFreeVars = analyzer.freeVars(fa).nonEmpty(); - ExpressionNode[] defaultArgs = JavaConverters.asJavaCollection(fa.p().ps()).stream() - .map(p -> p.e().isDefined() ? recurseExp(p.e().get()) : null) - .toArray(ExpressionNode[]::new); - // If the function has free variables it is a Closure - if (hasFreeVars) { - yield new ClosureNode(f, defaultArgs); - } - // If the function has optional arguments it is a Method - else { - yield new MethodNode(null, f, defaultArgs, false); - } - } - case FunApp fa when tipe(fa.f()) instanceof PackageEntryType -> { - Type t = tipe(fa); - PackageEntryType pet = (PackageEntryType) tipe(fa.f()); - TruffleEntryExtension e = getEntry(pet.pkgName(), pet.entName()); - yield e.toTruffle( - t, - JavaConverters.asJavaCollection(fa.args()).stream().map(a -> new Rql2Arg(a.e(), tipe(a.e()), a.idn())).toList(), - this - ); - } - case FunApp fa -> { - String[] argNames = JavaConverters.asJavaCollection(fa.args()).stream().map(a -> a.idn().isDefined() ? a.idn().get() : null).toArray(String[]::new); - ExpressionNode[] exps = JavaConverters.asJavaCollection(fa.args()).stream().map(a -> recurseExp(a.e())).toArray(ExpressionNode[]::new); - yield new InvokeNode(recurseExp(fa.f()), argNames, exps); - } - default -> throw new RawTruffleInternalErrorException("Unknown expression type"); - }; - } -} diff --git a/snapi-truffle/src/main/resources/META-INF/services/raw.compiler.rql2.api.EntryExtension b/snapi-truffle/src/main/resources/META-INF/services/raw.compiler.rql2.api.EntryExtension index 8c970ba56..323d208a8 100644 --- a/snapi-truffle/src/main/resources/META-INF/services/raw.compiler.rql2.api.EntryExtension +++ b/snapi-truffle/src/main/resources/META-INF/services/raw.compiler.rql2.api.EntryExtension @@ -1,209 +1,209 @@ -raw.compiler.snapi.truffle.builtin.byte_extension.TruffleByteFromEntry -raw.compiler.snapi.truffle.builtin.binary_extension.TruffleFromStringBinaryEntry -raw.compiler.snapi.truffle.builtin.binary_extension.TruffleBinaryReadEntry -raw.compiler.snapi.truffle.builtin.binary_extension.TruffleBinaryBase64Entry -raw.compiler.snapi.truffle.builtin.aws_extension.TruffleAwsV4SignedRequestEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleEmptyCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleBuildCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFilterCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleOrderByCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTransformCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleDistinctCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleCountCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTupleAvgCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMinCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMaxCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleSumCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFirstCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleLastCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleTakeCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleUnnestCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleFromCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleGroupCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleInternalJoinCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleInternalEquiJoinCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleUnionCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleExistsCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleZipCollectionEntry -raw.compiler.snapi.truffle.builtin.collection_extension.TruffleMkStringCollectionEntry -raw.compiler.snapi.truffle.builtin.csv_extension.TruffleCsvReadEntry -raw.compiler.snapi.truffle.builtin.csv_extension.TruffleCsvParseEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateBuildEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateFromEpochDayEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateFromTimestampEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateParseEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateNowEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateYearEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateMonthEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateDayEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateSubtractEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateAddIntervalEntry -raw.compiler.snapi.truffle.builtin.date_extension.TruffleDateSubtractIntervalEntry -raw.compiler.snapi.truffle.builtin.decimal_extension.TruffleDecimalFromEntry -raw.compiler.snapi.truffle.builtin.decimal_extension.TruffleDecimalRoundEntry -raw.compiler.snapi.truffle.builtin.double_extension.TruffleDoubleFromEntry -raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentSecretEntry -raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentScopesEntry -raw.compiler.snapi.truffle.builtin.environment_extension.TruffleEnvironmentParameterEntry -raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorBuildEntry -raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorBuildWithTypeEntry -raw.compiler.snapi.truffle.builtin.error_extension.TruffleErrorGetEntry -raw.compiler.snapi.truffle.builtin.float_extension.TruffleFloatFromEntry -raw.compiler.snapi.truffle.builtin.function_extension.TruffleFunctionInvokeAfterEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpReadEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpGetEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPostEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPutEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpDeleteEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpHeadEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpPatchEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpOptionsEntry -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpUrlEncode -raw.compiler.snapi.truffle.builtin.http_extension.TruffleHttpUrlDecode -raw.compiler.snapi.truffle.builtin.int_extension.TruffleIntFromEntry -raw.compiler.snapi.truffle.builtin.int_extension.TruffleIntRangeEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleBuildIntervalEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalToMillisEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalFromMillisEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalParseEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalYearsEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMonthsEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalWeeksEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalDaysEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalHoursEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMinutesEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalSecondsEntry -raw.compiler.snapi.truffle.builtin.interval_extension.TruffleIntervalMillisEntry -raw.compiler.snapi.truffle.builtin.json_extension.TruffleReadJsonEntry -raw.compiler.snapi.truffle.builtin.json_extension.TruffleParseJsonEntry -raw.compiler.snapi.truffle.builtin.json_extension.TrufflePrintJsonEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleEmptyListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleBuildListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleGetListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleFilterListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleTransformListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleTakeListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleSumListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleMaxListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleMinListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleFirstListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleLastListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleCountListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleFromListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleUnsafeFromListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleGroupListEntry -raw.compiler.snapi.truffle.builtin.list_extension.TruffleExistsListEntry -raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationFromStringEntry -raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationDescribeEntry -raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationLsEntry -raw.compiler.snapi.truffle.builtin.location_extension.TruffleLocationLlEntry -raw.compiler.snapi.truffle.builtin.long_extension.TruffleLongFromEntry -raw.compiler.snapi.truffle.builtin.long_extension.TruffleLongRangeEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathPiEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathRandomEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathPowerEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAtn2Entry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAbsEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAcosEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAsinEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathAtanEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCeilingEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCosEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathCotEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathDegreesEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathExpEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathLogEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathLog10Entry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathRadiansEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSignEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSinEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSqrtEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathTanEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathSquareEntry -raw.compiler.snapi.truffle.builtin.math_extension.TruffleMathFloorEntry -raw.compiler.snapi.truffle.builtin.mysql_extension.TruffleMySQLQueryEntry -raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableEmptyEntry -raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableBuildEntry -raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableIsNullEntry -raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableUnsafeGetEntry -raw.compiler.snapi.truffle.builtin.nullable_extension.TruffleNullableTransformEntry -raw.compiler.snapi.truffle.builtin.nullable_tryable_extension.TruffleFlatMapNullableTryableEntry -raw.compiler.snapi.truffle.builtin.oracle_extension.TruffleOracleQueryEntry -raw.compiler.snapi.truffle.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry -raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordBuildEntry -raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordConcatEntry -raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordFieldsEntry -raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordAddFieldEntry -raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordRemoveFieldEntry -raw.compiler.snapi.truffle.builtin.record_extension.TruffleRecordGetFieldByIndexEntry -raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexReplaceEntry -raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexMatchesEntry -raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexFirstMatchInEntry -raw.compiler.snapi.truffle.builtin.regex_extension.TruffleRegexGroupsEntry -raw.compiler.snapi.truffle.builtin.s3_extension.TruffleS3BuildEntry -raw.compiler.snapi.truffle.builtin.sqlserver_extension.TruffleSQLServerQueryEntry -raw.compiler.snapi.truffle.builtin.short_extension.TruffleShortFromEntry -raw.compiler.snapi.truffle.builtin.snowflake_extension.TruffleSnowflakeQueryEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringCapitalizeEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringFromEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReadEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringTrimEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLTrimEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringRTrimEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReplaceEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReverseEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReplicateEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringContainsEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringUpperEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLowerEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringSplitEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLengthEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringSubStringEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringCountSubStringEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringStartsWithEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringEmptyEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleBase64EntryExtension -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringEncodeEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringDecodeEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringLevenshteinDistanceEntry -raw.compiler.snapi.truffle.builtin.string_extension.TruffleStringReadLinesEntry -raw.compiler.snapi.truffle.builtin.success_extension.TruffleSuccessBuildEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeBuildEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeParseEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeNowEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeHourEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeMinuteEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSecondEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeMillisEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSubtractEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeAddIntervalEntry -raw.compiler.snapi.truffle.builtin.time_extension.TruffleTimeSubtractIntervalEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampBuildEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampFromDateEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampParseEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampNowEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampRangeEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampYearEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMonthEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampDayEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampHourEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMinuteEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSecondEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampMillisEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampFromUnixTimestampEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampToUnixTimestampEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSubtractEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampAddIntervalEntry -raw.compiler.snapi.truffle.builtin.timestamp_extension.TruffleTimestampSubtractIntervalEntry -raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryTransformEntry -raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryIsErrorEntry -raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryIsSuccessEntry -raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryFlatMapEntry -raw.compiler.snapi.truffle.builtin.try_extension.TruffleTryUnsafeGetEntry -raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeCastEntry -raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeProtectCastEntry -raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeEmptyEntry -raw.compiler.snapi.truffle.builtin.type_extension.TruffleTypeMatchEntry -raw.compiler.snapi.truffle.builtin.xml_extension.TruffleReadXmlEntry -raw.compiler.snapi.truffle.builtin.xml_extension.TruffleParseXmlEntry \ No newline at end of file +com.rawlabs.snapi.truffle.emitter.builtin.byte_extension.TruffleByteFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleFromStringBinaryEntry +com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryReadEntry +com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryBase64Entry +com.rawlabs.snapi.truffle.emitter.builtin.aws_extension.TruffleAwsV4SignedRequestEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleEmptyCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleBuildCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFilterCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleOrderByCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTransformCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleDistinctCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleCountCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTupleAvgCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMinCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMaxCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleSumCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFirstCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleLastCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTakeCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnnestCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFromCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleGroupCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleInternalJoinCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleInternalEquiJoinCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnionCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleExistsCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleZipCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMkStringCollectionEntry +com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvReadEntry +com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvParseEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromEpochDayEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromTimestampEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateParseEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateNowEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateYearEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateMonthEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateDayEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateAddIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalRoundEntry +com.rawlabs.snapi.truffle.emitter.builtin.double_extension.TruffleDoubleFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentSecretEntry +com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentScopesEntry +com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentParameterEntry +com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildWithTypeEntry +com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorGetEntry +com.rawlabs.snapi.truffle.emitter.builtin.float_extension.TruffleFloatFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.function_extension.TruffleFunctionInvokeAfterEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpReadEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpGetEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPostEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPutEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpDeleteEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpHeadEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPatchEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpOptionsEntry +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlEncode +com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlDecode +com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntRangeEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleBuildIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalToMillisEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalFromMillisEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalParseEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalYearsEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMonthsEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalWeeksEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalDaysEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalHoursEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMinutesEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalSecondsEntry +com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMillisEntry +com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleReadJsonEntry +com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleParseJsonEntry +com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TrufflePrintJsonEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleEmptyListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleBuildListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGetListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFilterListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTransformListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTakeListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleSumListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMaxListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMinListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFirstListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleLastListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleCountListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFromListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleUnsafeFromListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGroupListEntry +com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleExistsListEntry +com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationFromStringEntry +com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationDescribeEntry +com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLsEntry +com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLlEntry +com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongRangeEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPiEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRandomEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPowerEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtn2Entry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAbsEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAcosEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAsinEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtanEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCeilingEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCosEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCotEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathDegreesEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathExpEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLogEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLog10Entry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRadiansEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSignEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSinEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSqrtEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathTanEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSquareEntry +com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathFloorEntry +com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension.TruffleMySQLQueryEntry +com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableEmptyEntry +com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableIsNullEntry +com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableUnsafeGetEntry +com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableTransformEntry +com.rawlabs.snapi.truffle.emitter.builtin.nullable_tryable_extension.TruffleFlatMapNullableTryableEntry +com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension.TruffleOracleQueryEntry +com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry +com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordConcatEntry +com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordFieldsEntry +com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordAddFieldEntry +com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordRemoveFieldEntry +com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordGetFieldByIndexEntry +com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexReplaceEntry +com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexMatchesEntry +com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexFirstMatchInEntry +com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexGroupsEntry +com.rawlabs.snapi.truffle.emitter.builtin.s3_extension.TruffleS3BuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension.TruffleSQLServerQueryEntry +com.rawlabs.snapi.truffle.emitter.builtin.short_extension.TruffleShortFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension.TruffleSnowflakeQueryEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCapitalizeEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringFromEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringTrimEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLTrimEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringRTrimEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplaceEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReverseEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplicateEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringContainsEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringUpperEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLowerEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSplitEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLengthEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSubStringEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCountSubStringEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringStartsWithEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEmptyEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleBase64EntryExtension +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEncodeEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringDecodeEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLevenshteinDistanceEntry +com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadLinesEntry +com.rawlabs.snapi.truffle.emitter.builtin.success_extension.TruffleSuccessBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeParseEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeNowEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeHourEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMinuteEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSecondEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMillisEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeAddIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampBuildEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampFromDateEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampParseEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampNowEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampRangeEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampYearEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMonthEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampDayEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampHourEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMinuteEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSecondEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMillisEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampFromUnixTimestampEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampToUnixTimestampEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSubtractEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampAddIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSubtractIntervalEntry +com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryTransformEntry +com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsErrorEntry +com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsSuccessEntry +com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryFlatMapEntry +com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryUnsafeGetEntry +com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeCastEntry +com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeProtectCastEntry +com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeEmptyEntry +com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeMatchEntry +com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleReadXmlEntry +com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleParseXmlEntry \ No newline at end of file diff --git a/sql-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder b/sql-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder deleted file mode 100644 index 2606af215..000000000 --- a/sql-client/src/main/resources/META-INF/services/raw.client.api.CompilerServiceBuilder +++ /dev/null @@ -1 +0,0 @@ -raw.client.sql.SqlCompilerServiceBuilder \ No newline at end of file diff --git a/sql-client/src/main/java/module-info.java b/sql-compiler/src/main/java/module-info.java similarity index 69% rename from sql-client/src/main/java/module-info.java rename to sql-compiler/src/main/java/module-info.java index ad37427eb..7973f91f3 100644 --- a/sql-client/src/main/java/module-info.java +++ b/sql-compiler/src/main/java/module-info.java @@ -10,20 +10,23 @@ * licenses/APL.txt. */ -module raw.sql.client { +import com.rawlabs.compiler.CompilerServiceBuilder; +import com.rawlabs.sql.compiler.SqlCompilerServiceBuilder; + +module raw.sql.compiler { requires scala.library; requires org.slf4j; requires org.graalvm.polyglot; - requires raw.utils; + requires raw.utils.core; requires com.fasterxml.jackson.dataformat.csv; requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; - requires raw.protocol; - requires raw.client; + requires raw.protocol.compiler; + requires raw.compiler; requires raw.sql.parser; requires java.sql; requires com.zaxxer.hikari; - provides raw.client.api.CompilerServiceBuilder with - raw.client.sql.SqlCompilerServiceBuilder; + provides CompilerServiceBuilder with + SqlCompilerServiceBuilder; } diff --git a/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder b/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder new file mode 100644 index 000000000..e22eda1cd --- /dev/null +++ b/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder @@ -0,0 +1 @@ +com.rawlabs.sql.compiler.impl.SqlCompilerServiceBuilder \ No newline at end of file diff --git a/sql-client/src/main/resources/reference.conf b/sql-compiler/src/main/resources/reference.conf similarity index 97% rename from sql-client/src/main/resources/reference.conf rename to sql-compiler/src/main/resources/reference.conf index 85e32ed18..4036b8502 100644 --- a/sql-client/src/main/resources/reference.conf +++ b/sql-compiler/src/main/resources/reference.conf @@ -1,4 +1,4 @@ -raw.client.sql { +raw.sql.compiler { error-messages { missing-relation = "Did you forget to add credentials?" } diff --git a/sql-client/src/main/scala/raw/client/sql/ErrorCode.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/ErrorCode.scala similarity index 92% rename from sql-client/src/main/scala/raw/client/sql/ErrorCode.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/ErrorCode.scala index e71c14abb..e31b85caf 100644 --- a/sql-client/src/main/scala/raw/client/sql/ErrorCode.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/ErrorCode.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler object ErrorCode { val SqlErrorCode = "sqlError" diff --git a/sql-client/src/main/scala/raw/client/sql/NamedParametersPreparedStatement.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala similarity index 98% rename from sql-client/src/main/scala/raw/client/sql/NamedParametersPreparedStatement.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala index 9d11d2e50..031a1842d 100644 --- a/sql-client/src/main/scala/raw/client/sql/NamedParametersPreparedStatement.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala @@ -10,13 +10,40 @@ * licenses/APL.txt. */ -package raw.client.sql - +package com.rawlabs.sql.compiler + +import com.rawlabs.compiler.{ + ErrorMessage, + ErrorPosition, + ErrorRange, + RawBinary, + RawBool, + RawByte, + RawDate, + RawDecimal, + RawDouble, + RawFloat, + RawInt, + RawInterval, + RawLong, + RawNull, + RawShort, + RawString, + RawTime, + RawTimestamp, + RawValue +} +import com.rawlabs.sql.compiler.antlr4.{ + ParseProgramResult, + SqlBaseNode, + SqlParamDefaultCommentNode, + SqlParamTypeCommentNode, + SqlProgramNode, + SqlStatementNode +} import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.util.Position import org.postgresql.util.PSQLException -import raw.client.api._ -import raw.client.sql.antlr4._ import java.sql.{Connection, ResultSet, ResultSetMetaData} import scala.collection.mutable diff --git a/sql-client/src/main/scala/raw/client/sql/ResultSetIterator.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/ResultSetIterator.scala similarity index 88% rename from sql-client/src/main/scala/raw/client/sql/ResultSetIterator.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/ResultSetIterator.scala index 76e9d3c28..ee0889714 100644 --- a/sql-client/src/main/scala/raw/client/sql/ResultSetIterator.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/ResultSetIterator.scala @@ -10,13 +10,11 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler -import org.graalvm.polyglot.Context -import org.graalvm.polyglot.Value +import org.graalvm.polyglot.{Context, Value} -import java.sql.ResultSet -import java.sql.SQLException +import java.sql.{ResultSet, SQLException} import java.util @throws[SQLException] diff --git a/sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala similarity index 87% rename from sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala index 185b05fb8..4879557f7 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlCodeUtils.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala @@ -10,12 +10,19 @@ * licenses/APL.txt. */ -package raw.client.sql - +package com.rawlabs.sql.compiler + +import com.rawlabs.compiler.Pos +import com.rawlabs.sql.compiler.antlr4.{ + ParseProgramResult, + SqlBaseNode, + SqlIdentifierNode, + SqlParamUseNode, + SqlProjNode, + SqlStatementItemNode +} import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{oncetd, query} import org.bitbucket.inkytonik.kiama.util.Position -import raw.client.api.Pos -import raw.client.sql.antlr4._ case class SqlIdentifier(value: String, quoted: Boolean) diff --git a/sql-client/src/main/scala/raw/client/sql/SqlCompilerService.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/SqlCompilerService.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala index 8120048d5..046dc7e21 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlCompilerService.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler import com.google.common.cache.{CacheBuilder, CacheLoader} +import com.rawlabs.compiler._ +import com.rawlabs.sql.compiler.antlr4.{ParseProgramResult, RawSqlSyntaxAnalyzer, SqlIdnNode, SqlParamUseNode} +import com.rawlabs.sql.compiler.metadata.UserMetadataCache +import com.rawlabs.sql.compiler.writers.{TypedResultSetCsvWriter, TypedResultSetJsonWriter} +import com.rawlabs.utils.core.{RawSettings, RawUtils} import org.bitbucket.inkytonik.kiama.util.Positions -import raw.client.api._ -import raw.client.sql.antlr4.{ParseProgramResult, RawSqlSyntaxAnalyzer, SqlIdnNode, SqlParamUseNode} -import raw.client.sql.metadata.UserMetadataCache -import raw.client.sql.writers.{TypedResultSetCsvWriter, TypedResultSetJsonWriter} -import raw.utils.{RawSettings, RawUtils} import java.io.{IOException, OutputStream} import java.sql.{ResultSet, SQLException} @@ -35,8 +35,8 @@ class SqlCompilerService()(implicit protected val settings: RawSettings) extends // A short lived database metadata (schema/table/column names) indexed by JDBC URL. private val metadataBrowsers = { - val maxSize = settings.getInt("raw.client.sql.metadata-cache.max-matches") - val expiry = settings.getDuration("raw.client.sql.metadata-cache.match-validity") + val maxSize = settings.getInt("raw.sql.compiler.metadata-cache.max-matches") + val expiry = settings.getDuration("raw.sql.compiler.metadata-cache.match-validity") val loader = new CacheLoader[String, UserMetadataCache] { override def load(jdbcUrl: String): UserMetadataCache = new UserMetadataCache( jdbcUrl, @@ -47,8 +47,8 @@ class SqlCompilerService()(implicit protected val settings: RawSettings) extends } CacheBuilder .newBuilder() - .maximumSize(settings.getInt("raw.client.sql.metadata-cache.size")) - .expireAfterAccess(settings.getDuration("raw.client.sql.metadata-cache.duration")) + .maximumSize(settings.getInt("raw.sql.compiler.metadata-cache.size")) + .expireAfterAccess(settings.getDuration("raw.sql.compiler.metadata-cache.duration")) .build(loader) } diff --git a/sql-client/src/main/scala/raw/client/sql/SqlCompilerServiceBuilder.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerServiceBuilder.scala similarity index 78% rename from sql-client/src/main/scala/raw/client/sql/SqlCompilerServiceBuilder.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerServiceBuilder.scala index e3825b956..a285451a8 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlCompilerServiceBuilder.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerServiceBuilder.scala @@ -10,10 +10,11 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler -import raw.client.api.{CompilerService, CompilerServiceBuilder} -import raw.utils.RawSettings +import com.rawlabs.compiler.CompilerServiceBuilder +import com.rawlabs.compiler.CompilerService +import com.rawlabs.utils.core.RawSettings class SqlCompilerServiceBuilder extends CompilerServiceBuilder { override def language: Set[String] = Set("sql") diff --git a/sql-client/src/main/scala/raw/client/sql/SqlConnection.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlConnection.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/SqlConnection.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlConnection.scala index 7a13f2c87..8d07c5b49 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlConnection.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlConnection.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler import java.sql.{ Blob, @@ -26,7 +26,6 @@ import java.sql.{ Statement, Struct } -import java.{sql, util} import java.util.Properties import java.util.concurrent.Executor @@ -97,9 +96,9 @@ class SqlConnection(connectionPool: SqlConnectionPool, conn: Connection) extends override def prepareCall(sql: String, resultSetType: Int, resultSetConcurrency: Int): CallableStatement = conn.prepareCall(sql, resultSetType, resultSetConcurrency) - override def getTypeMap: util.Map[String, Class[_]] = conn.getTypeMap + override def getTypeMap: java.util.Map[String, Class[_]] = conn.getTypeMap - override def setTypeMap(map: util.Map[String, Class[_]]): Unit = conn.setTypeMap(map) + override def setTypeMap(map: java.util.Map[String, Class[_]]): Unit = conn.setTypeMap(map) override def setHoldability(holdability: Int): Unit = conn.setHoldability(holdability) @@ -157,7 +156,7 @@ class SqlConnection(connectionPool: SqlConnectionPool, conn: Connection) extends override def getClientInfo: Properties = conn.getClientInfo - override def createArrayOf(typeName: String, elements: Array[AnyRef]): sql.Array = + override def createArrayOf(typeName: String, elements: Array[AnyRef]): java.sql.Array = conn.createArrayOf(typeName, elements) override def createStruct(typeName: String, attributes: Array[AnyRef]): Struct = diff --git a/sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlConnectionPool.scala similarity index 94% rename from sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlConnectionPool.scala index 0e0f9a392..b69fe3947 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlConnectionPool.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlConnectionPool.scala @@ -10,9 +10,10 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler + import com.typesafe.scalalogging.StrictLogging -import raw.utils.{RawService, RawSettings, RawUtils} +import com.rawlabs.utils.core.{RawService, RawSettings, RawUtils} import java.sql.{Connection, SQLException} import java.time.Instant @@ -40,16 +41,17 @@ final private case class ConnectionState( class SqlConnectionPool()(implicit settings: RawSettings) extends RawService with StrictLogging { // Total max connections to the FDW database (across all users). - private val maxConnections = settings.getInt("raw.client.sql.pool.max-connections") + private val maxConnections = settings.getInt("raw.sql.compiler.pool.max-connections") // Max connections per user - private val maxConnectionsPerDb = settings.getInt("raw.client.sql.pool.max-connections-per-db") + private val maxConnectionsPerDb = settings.getInt("raw.sql.compiler.pool.max-connections-per-db") // Time in milliseconds after which a connection may be released (if not borrowed). - private val idleTimeout = settings.getDuration("raw.client.sql.pool.idle-timeout", TimeUnit.MILLISECONDS) + private val idleTimeout = settings.getDuration("raw.sql.compiler.pool.idle-timeout", TimeUnit.MILLISECONDS) - private val healthCheckPeriod = settings.getDuration("raw.client.sql.pool.health-check-period", TimeUnit.MILLISECONDS) + private val healthCheckPeriod = + settings.getDuration("raw.sql.compiler.pool.health-check-period", TimeUnit.MILLISECONDS) // The JDBC isValid() value to use. - private val isValidSeconds = settings.getInt("raw.client.sql.pool.is-valid-seconds") + private val isValidSeconds = settings.getInt("raw.sql.compiler.pool.is-valid-seconds") private val connectionPoolLock = new Object // Holds the connections available for each location. diff --git a/sql-client/src/main/scala/raw/client/sql/SqlIntervals.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala similarity index 97% rename from sql-client/src/main/scala/raw/client/sql/SqlIntervals.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala index 72b702608..7840d46fa 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlIntervals.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler -import raw.client.api.RawInterval +import com.rawlabs.compiler.RawInterval import scala.util.matching.Regex diff --git a/sql-client/src/main/scala/raw/client/sql/SqlTypesUtils.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala similarity index 99% rename from sql-client/src/main/scala/raw/client/sql/SqlTypesUtils.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala index 8f0dcdfd9..50f2fffb9 100644 --- a/sql-client/src/main/scala/raw/client/sql/SqlTypesUtils.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler -import raw.client.api._ +import com.rawlabs.compiler._ import scala.annotation.tailrec diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlErrorListener.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlErrorListener.scala similarity index 95% rename from sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlErrorListener.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlErrorListener.scala index 1ccfe6be8..dc7265c62 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlErrorListener.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlErrorListener.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 +import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange, Message} import org.antlr.v4.runtime.{BaseErrorListener, RecognitionException, Recognizer, Token} -import raw.client.api.{ErrorMessage, ErrorPosition, ErrorRange, Message} class RawSqlErrorListener() extends BaseErrorListener { diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlPositions.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlPositions.scala similarity index 98% rename from sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlPositions.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlPositions.scala index 99ce35a54..f977b046b 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlPositions.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlPositions.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 import org.antlr.v4.runtime.{ParserRuleContext, Token} import org.bitbucket.inkytonik.kiama.util.{Position, Positions, Source} diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlSyntaxAnalyzer.scala similarity index 93% rename from sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlSyntaxAnalyzer.scala index 0f116cf8e..2d2285f73 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlSyntaxAnalyzer.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlSyntaxAnalyzer.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 +import com.rawlabs.compiler.Message +import com.rawlabs.sql.parser.generated.{PsqlLexer, PsqlParser} import org.antlr.v4.runtime.tree.ParseTree import org.antlr.v4.runtime.{CharStreams, CommonTokenStream} import org.bitbucket.inkytonik.kiama.parsing.Parsers import org.bitbucket.inkytonik.kiama.util.{Positions, StringSource} -import raw.client.api.Message -import raw.client.sql.generated.{PsqlLexer, PsqlParser} import scala.collection.mutable diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlVisitor.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala similarity index 99% rename from sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlVisitor.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala index 19d35be12..a66dbf75d 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlVisitor.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 +import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange} +import com.rawlabs.sql.parser.generated.{PsqlParser, PsqlParserBaseVisitor} import org.antlr.v4.runtime.ParserRuleContext import org.antlr.v4.runtime.misc.Interval import org.bitbucket.inkytonik.kiama.util.{Positions, Source} -import raw.client.api.{ErrorMessage, ErrorPosition, ErrorRange} -import raw.client.sql.generated.{PsqlParser, PsqlParserBaseVisitor} import scala.collection.JavaConverters._ import scala.collection.mutable diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlVisitorParseErrors.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitorParseErrors.scala similarity index 88% rename from sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlVisitorParseErrors.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitorParseErrors.scala index f7119fe8f..2512d3b9c 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/RawSqlVisitorParseErrors.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitorParseErrors.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 -import raw.client.api.Message +import com.rawlabs.compiler.Message case class RawSqlVisitorParseErrors() { private var errors: List[Message] = List.empty diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/SqlNodes.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala similarity index 98% rename from sql-client/src/main/scala/raw/client/sql/antlr4/SqlNodes.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala index dea4b47aa..5d9b13905 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/SqlNodes.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 trait SqlBaseNode extends Product diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/SqlParam.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/antlr4/SqlParam.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala index cc36c4712..1fbca9902 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/SqlParam.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 /** * Represents a parameter in a SQL program diff --git a/sql-client/src/main/scala/raw/client/sql/antlr4/SqlParserErrors.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParserErrors.scala similarity index 91% rename from sql-client/src/main/scala/raw/client/sql/antlr4/SqlParserErrors.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParserErrors.scala index 2b8a52924..ba0632fd7 100644 --- a/sql-client/src/main/scala/raw/client/sql/antlr4/SqlParserErrors.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParserErrors.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.antlr4 +package com.rawlabs.sql.compiler.antlr4 object SqlParserErrors { val ParserErrorCode = "parserError" diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/Completion.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala similarity index 95% rename from sql-client/src/main/scala/raw/client/sql/metadata/Completion.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala index 44c5afdb6..aeecacbd6 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/Completion.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata +import com.rawlabs.sql.compiler.SqlIdentifier import com.typesafe.scalalogging.StrictLogging -import raw.client.sql.SqlIdentifier import java.sql.{Connection, PreparedStatement} diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/DotSearchWithOneItem.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/DotSearchWithOneItem.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/metadata/DotSearchWithOneItem.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/DotSearchWithOneItem.scala index dcbae765e..d2c57c4c6 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/DotSearchWithOneItem.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/DotSearchWithOneItem.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata import java.sql.PreparedStatement diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/DotSearchWithTwoItems.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/DotSearchWithTwoItems.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/metadata/DotSearchWithTwoItems.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/DotSearchWithTwoItems.scala index c7bc2b454..324da06b3 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/DotSearchWithTwoItems.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/DotSearchWithTwoItems.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata import java.sql.PreparedStatement diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/UserMetadataCache.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/metadata/UserMetadataCache.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala index c64e587ca..7a7460d12 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/UserMetadataCache.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala @@ -10,15 +10,14 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata import com.google.common.cache.{CacheBuilder, CacheLoader} +import com.rawlabs.sql.compiler.antlr4.{SqlIdentifierNode, SqlIdnNode, SqlProjNode} +import com.rawlabs.sql.compiler.{SqlConnectionPool, SqlIdentifier} import com.typesafe.scalalogging.StrictLogging import java.time.Duration -import raw.client.sql.antlr4.{SqlIdentifierNode, SqlIdnNode, SqlProjNode} -import raw.client.sql.{SqlConnectionPool, SqlIdentifier} - import java.sql.SQLException case class IdentifierInfo(name: Seq[SqlIdentifier], tipe: String) diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithOneItem.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithOneItem.scala similarity index 97% rename from sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithOneItem.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithOneItem.scala index 1d186349a..455f48994 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithOneItem.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithOneItem.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata import java.sql.PreparedStatement diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithThreeItems.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithThreeItems.scala similarity index 96% rename from sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithThreeItems.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithThreeItems.scala index 42ca64ed3..86b633b37 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithThreeItems.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithThreeItems.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata import java.sql.PreparedStatement diff --git a/sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithTwoItems.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithTwoItems.scala similarity index 97% rename from sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithTwoItems.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithTwoItems.scala index 6a4a0003c..b4557412b 100644 --- a/sql-client/src/main/scala/raw/client/sql/metadata/WordSearchWithTwoItems.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/WordSearchWithTwoItems.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.client.sql.metadata +package com.rawlabs.sql.compiler.metadata import java.sql.PreparedStatement diff --git a/sql-client/src/main/scala/raw/client/sql/writers/TypedResultSetCsvWriter.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala similarity index 92% rename from sql-client/src/main/scala/raw/client/sql/writers/TypedResultSetCsvWriter.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala index b9d40efaf..e18cb214e 100644 --- a/sql-client/src/main/scala/raw/client/sql/writers/TypedResultSetCsvWriter.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala @@ -10,13 +10,31 @@ * licenses/APL.txt. */ -package raw.client.sql.writers +package com.rawlabs.sql.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonParser} import com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING import com.fasterxml.jackson.dataformat.csv.{CsvFactory, CsvSchema} -import raw.client.api._ -import raw.client.utils.RecordFieldsNaming +import com.rawlabs.compiler.{ + RawAnyType, + RawBoolType, + RawByteType, + RawDateType, + RawDecimalType, + RawDoubleType, + RawFloatType, + RawIntType, + RawIterableType, + RawListType, + RawLongType, + RawRecordType, + RawShortType, + RawStringType, + RawTimeType, + RawTimestampType, + RawType +} +import com.rawlabs.compiler.utils.RecordFieldsNaming import java.io.{IOException, OutputStream} import java.sql.ResultSet diff --git a/sql-client/src/main/scala/raw/client/sql/writers/TypedResultSetJsonWriter.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala similarity index 91% rename from sql-client/src/main/scala/raw/client/sql/writers/TypedResultSetJsonWriter.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala index 7b9da6744..080d0dc07 100644 --- a/sql-client/src/main/scala/raw/client/sql/writers/TypedResultSetJsonWriter.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala @@ -10,13 +10,32 @@ * licenses/APL.txt. */ -package raw.client.sql.writers +package com.rawlabs.sql.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonParser} import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} -import raw.client.api._ -import raw.client.sql.SqlIntervals.{intervalToString, parseInterval} -import raw.client.utils.RecordFieldsNaming +import com.rawlabs.compiler.{ + RawAnyType, + RawBoolType, + RawByteType, + RawDateType, + RawDecimalType, + RawDoubleType, + RawFloatType, + RawIntType, + RawIntervalType, + RawIterableType, + RawListType, + RawLongType, + RawRecordType, + RawShortType, + RawStringType, + RawTimeType, + RawTimestampType, + RawType +} +import com.rawlabs.sql.compiler.SqlIntervals.{intervalToString, parseInterval} +import com.rawlabs.compiler.utils.RecordFieldsNaming import java.io.{IOException, OutputStream} import java.sql.ResultSet diff --git a/sql-client/src/test/resources/example.sql b/sql-compiler/src/test/resources/example.sql similarity index 100% rename from sql-client/src/test/resources/example.sql rename to sql-compiler/src/test/resources/example.sql diff --git a/sql-client/src/test/scala/raw/client/sql/TestNamedParametersStatement.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala similarity index 97% rename from sql-client/src/test/scala/raw/client/sql/TestNamedParametersStatement.scala rename to sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala index f21ceed19..bae7ed934 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestNamedParametersStatement.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler import com.dimafeng.testcontainers.{ForAllTestContainer, PostgreSQLContainer} +import com.rawlabs.compiler.{RawInt, RawString} +import com.rawlabs.sql.compiler.antlr4.RawSqlSyntaxAnalyzer import org.bitbucket.inkytonik.kiama.util.Positions import org.testcontainers.utility.DockerImageName -import raw.client.api.{RawInt, RawString} -import raw.client.sql.antlr4.RawSqlSyntaxAnalyzer -import raw.utils._ +import com.rawlabs.utils.core._ import java.sql.{Connection, ResultSet} diff --git a/sql-client/src/test/scala/raw/client/sql/TestParseIntervals.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala similarity index 93% rename from sql-client/src/test/scala/raw/client/sql/TestParseIntervals.scala rename to sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala index 298307c8d..278c6ac79 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestParseIntervals.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala @@ -10,11 +10,12 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler +import com.rawlabs.compiler.RawInterval +import com.rawlabs.sql.compiler.SqlIntervals.parseInterval import org.scalatest.funsuite.AnyFunSuite -import raw.client.api.RawInterval -import raw.client.sql.SqlIntervals.parseInterval + class TestParseIntervals extends AnyFunSuite { test("parse singular interval items") { diff --git a/sql-client/src/test/scala/raw/client/sql/TestPrintIntervals.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestPrintIntervals.scala similarity index 92% rename from sql-client/src/test/scala/raw/client/sql/TestPrintIntervals.scala rename to sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestPrintIntervals.scala index 5910b6677..9f504b739 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestPrintIntervals.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestPrintIntervals.scala @@ -10,11 +10,12 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler +import com.rawlabs.compiler.RawInterval +import com.rawlabs.sql.compiler.SqlIntervals.intervalToString import org.scalatest.funsuite.AnyFunSuite -import raw.client.api.RawInterval -import raw.client.sql.SqlIntervals.intervalToString + class TestPrintIntervals extends AnyFunSuite { test("parse singular interval items") { diff --git a/sql-client/src/test/scala/raw/client/sql/TestSqlCompilerServiceAirports.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlCompilerServiceAirports.scala similarity index 98% rename from sql-client/src/test/scala/raw/client/sql/TestSqlCompilerServiceAirports.scala rename to sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlCompilerServiceAirports.scala index 9c18a31a2..ae934c363 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestSqlCompilerServiceAirports.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlCompilerServiceAirports.scala @@ -10,12 +10,39 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler import com.dimafeng.testcontainers.{ForAllTestContainer, PostgreSQLContainer} +import com.rawlabs.compiler.{ + CompilerService, + ErrorMessage, + ErrorPosition, + ExecutionRuntimeFailure, + ExecutionSuccess, + ExecutionValidationFailure, + GetProgramDescriptionFailure, + GetProgramDescriptionSuccess, + LetBindCompletion, + ParamDescription, + Pos, + ProgramEnvironment, + RawAttrType, + RawDateType, + RawDecimalType, + RawInt, + RawIntType, + RawIterableType, + RawLongType, + RawNull, + RawRecordType, + RawString, + RawStringType, + RawValue, + TypeCompletion, + ValidateResponse +} import org.testcontainers.utility.DockerImageName -import raw.client.api._ -import raw.utils._ +import com.rawlabs.utils.core._ import java.io.ByteArrayOutputStream import java.sql.DriverManager diff --git a/sql-client/src/test/scala/raw/client/sql/TestSqlConnectionFailures.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala similarity index 90% rename from sql-client/src/test/scala/raw/client/sql/TestSqlConnectionFailures.scala rename to sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala index f9d07d3d7..34395e225 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestSqlConnectionFailures.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala @@ -10,14 +10,30 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler import com.dimafeng.testcontainers.{ForAllTestContainer, PostgreSQLContainer} +import com.rawlabs.compiler.{ + AutoCompleteResponse, + CompilerService, + ExecutionResponse, + ExecutionRuntimeFailure, + ExecutionSuccess, + GetProgramDescriptionFailure, + GetProgramDescriptionResponse, + GetProgramDescriptionSuccess, + HoverResponse, + LetBindCompletion, + Pos, + ProgramEnvironment, + RawInt, + TypeCompletion, + ValidateResponse +} import org.scalatest.matchers.must.Matchers.be import org.scalatest.matchers.should.Matchers.convertToAnyShouldWrapper import org.testcontainers.utility.DockerImageName -import raw.client.api._ -import raw.utils._ +import com.rawlabs.utils.core._ import java.io.ByteArrayOutputStream import java.sql.DriverManager @@ -104,8 +120,8 @@ class TestSqlConnectionFailures // because it could pick a connection. val joe = users.head val others = users.tail - property("raw.client.sql.pool.max-connections", s"$nUsers") // enough for everyone - property("raw.client.sql.pool.max-connections-per-db", s"1") + property("raw.sql.compiler.pool.max-connections", s"$nUsers") // enough for everyone + property("raw.sql.compiler.pool.max-connections-per-db", s"1") val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(others.size) try { @@ -141,8 +157,8 @@ class TestSqlConnectionFailures // because the number of max-connections is set to others.size, they're all taken. val joe = users.head val others = users.tail - property("raw.client.sql.pool.max-connections", s"${others.size}") // one less than needed - property("raw.client.sql.pool.max-connections-per-db", s"1") + property("raw.sql.compiler.pool.max-connections", s"${others.size}") // one less than needed + property("raw.sql.compiler.pool.max-connections-per-db", s"1") val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(others.size) try { @@ -174,8 +190,8 @@ class TestSqlConnectionFailures // Again, a single user runs LSP calls while all (including itself) are running long connections. // With two connections available, the single user manages to run all LSP calls. val joe = users.head - property("raw.client.sql.pool.max-connections", s"${nUsers * 2}") - property("raw.client.sql.pool.max-connections-per-db", s"2") + property("raw.sql.compiler.pool.max-connections", s"${nUsers * 2}") + property("raw.sql.compiler.pool.max-connections-per-db", s"2") val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(users.size) try { @@ -207,8 +223,8 @@ class TestSqlConnectionFailures // All users run a long query, including the one who then issues an LSP request. The LSP fails because // only one connection per user is allowed. val joe = users.head - property("raw.client.sql.pool.max-connections", s"${nUsers * 2}") // plenty - property("raw.client.sql.pool.max-connections-per-db", s"1") // only one per user + property("raw.sql.compiler.pool.max-connections", s"${nUsers * 2}") // plenty + property("raw.sql.compiler.pool.max-connections-per-db", s"1") // only one per user val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(users.size) try { @@ -243,8 +259,8 @@ class TestSqlConnectionFailures * In total, there's one connection per user. Setting max-connections to nUsers is working. */ val nCalls = 2 - property("raw.client.sql.pool.max-connections", s"$nUsers") - property("raw.client.sql.pool.max-connections-per-db", s"1") + property("raw.sql.compiler.pool.max-connections", s"$nUsers") + property("raw.sql.compiler.pool.max-connections-per-db", s"1") val compilerService = new SqlCompilerService() val iterations = 1 to nCalls try { @@ -265,8 +281,8 @@ class TestSqlConnectionFailures // a total number of queries of nUsers x nCalls. We set max-connections to that value to be sure and // set max-connections-per-db to nCalls so that all concurrent queries can run. val nCalls = 3 - property("raw.client.sql.pool.max-connections", s"${nUsers * nCalls}") // enough total - property("raw.client.sql.pool.max-connections-per-db", s"$nCalls") // exactly what is needed per user + property("raw.sql.compiler.pool.max-connections", s"${nUsers * nCalls}") // enough total + property("raw.sql.compiler.pool.max-connections-per-db", s"$nCalls") // exactly what is needed per user val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(nUsers * nCalls) val iterations = 1 to nCalls @@ -293,8 +309,8 @@ class TestSqlConnectionFailures * expected failure. The number of errors hit should be positive (checked in the end) */ val nCalls = 2 - property("raw.client.sql.pool.max-connections", s"${nUsers - 1}") - property("raw.client.sql.pool.max-connections-per-db", s"1") + property("raw.sql.compiler.pool.max-connections", s"${nUsers - 1}") + property("raw.sql.compiler.pool.max-connections-per-db", s"1") val compilerService = new SqlCompilerService() val iterations = 1 to nCalls try { @@ -319,8 +335,8 @@ class TestSqlConnectionFailures * expected failure. The number of errors hit should be positive (checked in the end) */ val nCalls = 2 - property("raw.client.sql.pool.max-connections", s"${nUsers - 1}") - property("raw.client.sql.pool.max-connections-per-db", s"1") + property("raw.sql.compiler.pool.max-connections", s"${nUsers - 1}") + property("raw.sql.compiler.pool.max-connections-per-db", s"1") val compilerService = new SqlCompilerService() val iterations = 1 to nCalls try { @@ -346,8 +362,8 @@ class TestSqlConnectionFailures * expected failure. The number of errors hit should be positive (checked in the end) */ val nCalls = 2 - property("raw.client.sql.pool.max-connections", s"${nUsers - 1}") - property("raw.client.sql.pool.max-connections-per-db", s"1") + property("raw.sql.compiler.pool.max-connections", s"${nUsers - 1}") + property("raw.sql.compiler.pool.max-connections-per-db", s"1") val compilerService = new SqlCompilerService() val iterations = 1 to nCalls try { @@ -373,8 +389,8 @@ class TestSqlConnectionFailures // set max-connections-per-db to two so that all concurrent queries cannot all get a connection although // max-connections would allow it. val nCalls = 10 - property("raw.client.sql.pool.max-connections", s"${nUsers * nCalls}") // in principle enough - property("raw.client.sql.pool.max-connections-per-db", s"1") // but only few connections per user + property("raw.sql.compiler.pool.max-connections", s"${nUsers * nCalls}") // in principle enough + property("raw.sql.compiler.pool.max-connections-per-db", s"1") // but only few connections per user val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(nUsers * nCalls) val iterations = 1 to nCalls @@ -404,8 +420,8 @@ class TestSqlConnectionFailures // set max-connections-per-db to two so that all concurrent queries cannot all get a connection although // max-connections would allow it. val nCalls = 10 - property("raw.client.sql.pool.max-connections", s"${nUsers * nCalls}") // in principle enough - property("raw.client.sql.pool.max-connections-per-db", s"1") // but only few connections per user + property("raw.sql.compiler.pool.max-connections", s"${nUsers * nCalls}") // in principle enough + property("raw.sql.compiler.pool.max-connections-per-db", s"1") // but only few connections per user val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(nUsers * nCalls) val iterations = 1 to nCalls @@ -438,8 +454,8 @@ class TestSqlConnectionFailures // set max-connections-per-db to two so that all concurrent queries cannot all get a connection although // max-connections would allow it. val nCalls = 10 - property("raw.client.sql.pool.max-connections", s"${nUsers * nCalls}") // in principle enough - property("raw.client.sql.pool.max-connections-per-db", s"1") // but only few connections per user + property("raw.sql.compiler.pool.max-connections", s"${nUsers * nCalls}") // in principle enough + property("raw.sql.compiler.pool.max-connections-per-db", s"1") // but only few connections per user val compilerService = new SqlCompilerService() val pool = Executors.newFixedThreadPool(nUsers * nCalls) val iterations = 1 to nCalls diff --git a/sql-client/src/test/scala/raw/client/sql/TestSqlParser.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala similarity index 99% rename from sql-client/src/test/scala/raw/client/sql/TestSqlParser.scala rename to sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala index 52f82cc8e..5b1abdb14 100644 --- a/sql-client/src/test/scala/raw/client/sql/TestSqlParser.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala @@ -10,11 +10,9 @@ * licenses/APL.txt. */ -package raw.client.sql +package com.rawlabs.sql.compiler -import org.bitbucket.inkytonik.kiama.util.Positions -import org.scalatest.funsuite.AnyFunSuite -import raw.client.sql.antlr4.{ +import com.rawlabs.sql.compiler.antlr4.{ ParseProgramResult, RawSqlSyntaxAnalyzer, SqlFunctionCall, @@ -26,6 +24,8 @@ import raw.client.sql.antlr4.{ SqlStringLiteralNode, SqlWithComaSeparatorNode } +import org.bitbucket.inkytonik.kiama.util.Positions +import org.scalatest.funsuite.AnyFunSuite class TestSqlParser extends AnyFunSuite { diff --git a/sql-parser/src/main/java/raw/readme.md b/sql-parser/README.md similarity index 100% rename from sql-parser/src/main/java/raw/readme.md rename to sql-parser/README.md diff --git a/sql-parser/src/main/java/raw/psql/grammar/PsqlLexer.g4 b/sql-parser/src/main/java/com/rawlabs/sql/parser/grammar/PsqlLexer.g4 similarity index 100% rename from sql-parser/src/main/java/raw/psql/grammar/PsqlLexer.g4 rename to sql-parser/src/main/java/com/rawlabs/sql/parser/grammar/PsqlLexer.g4 diff --git a/sql-parser/src/main/java/raw/psql/grammar/PsqlParser.g4 b/sql-parser/src/main/java/com/rawlabs/sql/parser/grammar/PsqlParser.g4 similarity index 100% rename from sql-parser/src/main/java/raw/psql/grammar/PsqlParser.g4 rename to sql-parser/src/main/java/com/rawlabs/sql/parser/grammar/PsqlParser.g4 diff --git a/sql-parser/src/main/java/module-info.java b/sql-parser/src/main/java/module-info.java index c3c4d61bd..33e25937f 100644 --- a/sql-parser/src/main/java/module-info.java +++ b/sql-parser/src/main/java/module-info.java @@ -11,7 +11,7 @@ */ module raw.sql.parser { - exports raw.client.sql.generated; + exports com.rawlabs.sql.parser.generated; requires org.antlr.antlr4.runtime; } diff --git a/tests.sh b/tests.sh index 767f37278..5a483fe68 100755 --- a/tests.sh +++ b/tests.sh @@ -7,11 +7,11 @@ SCRIPT_HOME="$(cd "$(dirname "$0")"; pwd)" yes n | sdk install java 21.0.1-graalce || true sdk use java 21.0.1-graalce -# snapi-frontend -sbt snapiFrontend/test +# compiler-snapi-frontend +sbt compilerSnapiFrontend/test -# snapi-client -sbt snapiClient/test +# compiler-snapi +sbt compilerSnapi/test -# sql-client -sbt sqlClient/test +# compiler-sql +sbt compilerSql/test diff --git a/utils/src/main/java/module-info.java b/utils-core/src/main/java/module-info.java similarity index 90% rename from utils/src/main/java/module-info.java rename to utils-core/src/main/java/module-info.java index 39124bc20..75e29303d 100644 --- a/utils/src/main/java/module-info.java +++ b/utils-core/src/main/java/module-info.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -module raw.utils { +module raw.utils.core { requires scala.library; requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; @@ -25,8 +25,8 @@ requires com.google.common; requires jul.to.slf4j; - exports raw.utils; + exports com.rawlabs.utils.core; - opens raw.utils to + opens com.rawlabs.utils.core to com.fasterxml.jackson.databind; } diff --git a/utils/src/main/resources/reference.conf b/utils-core/src/main/resources/reference.conf similarity index 100% rename from utils/src/main/resources/reference.conf rename to utils-core/src/main/resources/reference.conf diff --git a/utils/src/main/scala/raw/utils/RawException.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawException.scala similarity index 77% rename from utils/src/main/scala/raw/utils/RawException.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawException.scala index 558762f76..d9010a9a8 100644 --- a/utils/src/main/scala/raw/utils/RawException.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawException.scala @@ -10,11 +10,10 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core /** * Top-level Exception. - * Message contains information that can be shared with the end-user. - * TODO (msb): Add methods formalizing error codes, etc. + * Message contains information that WILL BE shared with the end-user, so ensure it does not leak sensitive information. */ class RawException(message: String, cause: Throwable = null) extends RuntimeException(message, cause) diff --git a/utils/src/main/scala/raw/utils/RawMBeansManager.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawMBeansManager.scala similarity index 98% rename from utils/src/main/scala/raw/utils/RawMBeansManager.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawMBeansManager.scala index 7785d7e78..ae9c0dfbf 100644 --- a/utils/src/main/scala/raw/utils/RawMBeansManager.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawMBeansManager.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.typesafe.scalalogging.StrictLogging diff --git a/utils/src/main/scala/raw/utils/RawService.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawService.scala similarity index 85% rename from utils/src/main/scala/raw/utils/RawService.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawService.scala index 208ce5851..6a3b58479 100644 --- a/utils/src/main/scala/raw/utils/RawService.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawService.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.typesafe.scalalogging.StrictLogging @@ -20,7 +20,7 @@ import scala.util.control.NonFatal object RawService { - private[raw] val services = new LinkedBlockingQueue[RawService] + private[rawlabs] val services = new LinkedBlockingQueue[RawService] /** Used by main's to stop all created services. */ def stopAll(): Unit = { @@ -28,7 +28,7 @@ object RawService { } /** Used by test framework to assert all services were stopped. */ - private[raw] def isStopped(): Boolean = { + private[rawlabs] def isStopped(): Boolean = { services.size() == 0 } @@ -85,3 +85,11 @@ trait RawService extends StrictLogging { protected def doStop(): Unit } + +/** + * Exception thrown by a service. + * + * @param message the exception message + * @param cause the exception cause + */ +class RawServiceException(message: String, cause: Throwable = null) extends RawException(message, cause) diff --git a/utils/src/main/scala/raw/utils/RawSettings.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawSettings.scala similarity index 99% rename from utils/src/main/scala/raw/utils/RawSettings.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawSettings.scala index a9b8c5376..31d6a5b46 100644 --- a/utils/src/main/scala/raw/utils/RawSettings.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawSettings.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.typesafe.config._ import com.typesafe.scalalogging.StrictLogging diff --git a/utils/src/main/scala/raw/utils/RawUid.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawUid.scala similarity index 93% rename from utils/src/main/scala/raw/utils/RawUid.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawUid.scala index 50d1f0b00..438ccc421 100644 --- a/utils/src/main/scala/raw/utils/RawUid.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawUid.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core final case class RawUid(uid: String) { override def toString: String = uid diff --git a/utils/src/main/scala/raw/utils/RawUtils.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawUtils.scala similarity index 97% rename from utils/src/main/scala/raw/utils/RawUtils.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawUtils.scala index 2e627bf04..157f2eb77 100644 --- a/utils/src/main/scala/raw/utils/RawUtils.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawUtils.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.google.common.io.Resources import com.google.common.util.concurrent.ThreadFactoryBuilder @@ -29,6 +29,12 @@ import scala.util.control.NonFatal import scala.collection.JavaConverters._ import org.apache.commons.text.StringEscapeUtils +/** + * "Random" collection of utility methods. + * + * NOTE that this classes uses the `StrictLogging` trait from the `com.typesafe.scalalogging` package. + * TODO (msb): Remove StrictLogging and make logger a parameter where needed. + */ object RawUtils extends StrictLogging { /** diff --git a/utils/src/main/scala/raw/utils/RawVerboseRunnable.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala similarity index 97% rename from utils/src/main/scala/raw/utils/RawVerboseRunnable.scala rename to utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala index f4e831519..1c733c58c 100644 --- a/utils/src/main/scala/raw/utils/RawVerboseRunnable.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.typesafe.scalalogging.StrictLogging diff --git a/utils/src/test/scala/raw/utils/RawMultiplyingTestSuite.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala similarity index 98% rename from utils/src/test/scala/raw/utils/RawMultiplyingTestSuite.scala rename to utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala index 0b28d2dc2..0c9373ec6 100644 --- a/utils/src/test/scala/raw/utils/RawMultiplyingTestSuite.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import org.scalatest.{Args, CompositeStatus, Status} diff --git a/utils/src/test/scala/raw/utils/RawTestSuite.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala similarity index 98% rename from utils/src/test/scala/raw/utils/RawTestSuite.scala rename to utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala index c585d309e..9050017f4 100644 --- a/utils/src/test/scala/raw/utils/RawTestSuite.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.typesafe.scalalogging.StrictLogging import org.scalatest.funsuite.FixtureAnyFunSuite diff --git a/utils/src/test/scala/raw/utils/SettingsTestContext.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala similarity index 96% rename from utils/src/test/scala/raw/utils/SettingsTestContext.scala rename to utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala index 5f6a621d4..a905846c7 100644 --- a/utils/src/test/scala/raw/utils/SettingsTestContext.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core import com.typesafe.config.ConfigFactory diff --git a/utils/src/test/scala/raw/utils/TrainingWheelsContext.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala similarity index 83% rename from utils/src/test/scala/raw/utils/TrainingWheelsContext.scala rename to utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala index 8864fff20..a352c1fde 100644 --- a/utils/src/test/scala/raw/utils/TrainingWheelsContext.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.utils +package com.rawlabs.utils.core trait TrainingWheelsContext { this: RawTestSuite with SettingsTestContext => property("raw.training-wheels", "true") - property("raw.check-syntax-analyzers", "false") + property("raw.snapi.frontend.check-syntax-analyzers", "false") } diff --git a/sources/src/main/java/module-info.java b/utils-sources/src/main/java/module-info.java similarity index 69% rename from sources/src/main/java/module-info.java rename to utils-sources/src/main/java/module-info.java index 8b0737a17..fb33e680f 100644 --- a/sources/src/main/java/module-info.java +++ b/utils-sources/src/main/java/module-info.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -module raw.sources { +module raw.utils.sources { requires scala.library; requires org.slf4j; requires com.fasterxml.jackson.core; @@ -59,24 +59,24 @@ requires ojdbc10; requires snowflake.jdbc; requires dropbox.core.sdk; - requires raw.utils; + requires raw.utils.core; - exports raw.sources.api; - exports raw.sources.bytestream.api; - exports raw.sources.bytestream.github; - exports raw.sources.bytestream.http; - exports raw.sources.bytestream.inmemory; - exports raw.sources.filesystem.api; - exports raw.sources.filesystem.dropbox; - exports raw.sources.filesystem.local; - exports raw.sources.filesystem.mock; - exports raw.sources.filesystem.s3; - exports raw.sources.jdbc.api; - exports raw.sources.jdbc.mysql; - exports raw.sources.jdbc.pgsql; - exports raw.sources.jdbc.snowflake; - exports raw.sources.jdbc.sqlite; - exports raw.sources.jdbc.sqlserver; - exports raw.sources.jdbc.oracle; - exports raw.sources.jdbc.teradata; + exports com.rawlabs.utils.sources.api; + exports com.rawlabs.utils.sources.bytestream.api; + exports com.rawlabs.utils.sources.bytestream.github; + exports com.rawlabs.utils.sources.bytestream.http; + exports com.rawlabs.utils.sources.bytestream.inmemory; + exports com.rawlabs.utils.sources.filesystem.api; + exports com.rawlabs.utils.sources.filesystem.dropbox; + exports com.rawlabs.utils.sources.filesystem.local; + exports com.rawlabs.utils.sources.filesystem.mock; + exports com.rawlabs.utils.sources.filesystem.s3; + exports com.rawlabs.utils.sources.jdbc.api; + exports com.rawlabs.utils.sources.jdbc.mysql; + exports com.rawlabs.utils.sources.jdbc.pgsql; + exports com.rawlabs.utils.sources.jdbc.snowflake; + exports com.rawlabs.utils.sources.jdbc.sqlite; + exports com.rawlabs.utils.sources.jdbc.sqlserver; + exports com.rawlabs.utils.sources.jdbc.oracle; + exports com.rawlabs.utils.sources.jdbc.teradata; } diff --git a/sources/src/main/resources/reference.conf b/utils-sources/src/main/resources/reference.conf similarity index 75% rename from sources/src/main/resources/reference.conf rename to utils-sources/src/main/resources/reference.conf index e7439822c..d766d1aee 100644 --- a/sources/src/main/resources/reference.conf +++ b/utils-sources/src/main/resources/reference.conf @@ -1,16 +1,4 @@ -raw.rest.client { - async-request-retries = 10 - - service-not-available-retries = 10 - service-not-available-retry-interval = 1s - - connect-timeout = 20s - socket-timeout = 120s - - max-conn-per-route = 20 - max-conn-total = 100 -} -raw.sources { +raw.utils.sources { rdbms { connect-timeout = 30 s read-timeout = 300 s diff --git a/sources/src/main/scala/raw/sources/api/Encodings.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/api/Encodings.scala similarity index 98% rename from sources/src/main/scala/raw/sources/api/Encodings.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/api/Encodings.scala index e0955f48d..405a025f2 100644 --- a/sources/src/main/scala/raw/sources/api/Encodings.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/api/Encodings.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.api +package com.rawlabs.utils.sources.api import java.nio.charset.Charset import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} diff --git a/sources/src/main/scala/raw/sources/api/Location.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/api/Location.scala similarity index 91% rename from sources/src/main/scala/raw/sources/api/Location.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/api/Location.scala index 70e1fa1eb..3dd843ca4 100644 --- a/sources/src/main/scala/raw/sources/api/Location.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/api/Location.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.api +package com.rawlabs.utils.sources.api trait Location { diff --git a/sources/src/main/scala/raw/sources/api/LocationException.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/api/LocationException.scala similarity index 85% rename from sources/src/main/scala/raw/sources/api/LocationException.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/api/LocationException.scala index 3e96e92ab..66445725f 100644 --- a/sources/src/main/scala/raw/sources/api/LocationException.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/api/LocationException.scala @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.sources.api +package com.rawlabs.utils.sources.api -import raw.utils.RawException +import com.rawlabs.utils.core.RawException class LocationException(message: String, cause: Throwable = null) extends RawException(message, cause) diff --git a/sources/src/main/scala/raw/sources/bytestream/api/ByteStreamException.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/ByteStreamException.scala similarity index 82% rename from sources/src/main/scala/raw/sources/bytestream/api/ByteStreamException.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/ByteStreamException.scala index a44ffd4ce..070347cd2 100644 --- a/sources/src/main/scala/raw/sources/bytestream/api/ByteStreamException.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/ByteStreamException.scala @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api -import raw.sources.api.LocationException +import com.rawlabs.utils.sources.api.LocationException class ByteStreamException(message: String, cause: Throwable = null) extends LocationException(message, cause) diff --git a/sources/src/main/scala/raw/sources/bytestream/api/ByteStreamLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/ByteStreamLocation.scala similarity index 96% rename from sources/src/main/scala/raw/sources/bytestream/api/ByteStreamLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/ByteStreamLocation.scala index 0f23fe246..ea783554b 100644 --- a/sources/src/main/scala/raw/sources/bytestream/api/ByteStreamLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/ByteStreamLocation.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api import java.io.{IOException, InputStream, InputStreamReader, Reader} import java.nio.charset.{Charset, StandardCharsets} import java.nio.file.Path import org.apache.commons.io.ByteOrderMark import org.apache.commons.io.input.BOMInputStream -import raw.sources.api._ +import com.rawlabs.utils.sources.api._ import scala.util.control.NonFatal diff --git a/sources/src/main/scala/raw/sources/bytestream/api/DelegatingSeekableInputStream.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/DelegatingSeekableInputStream.scala similarity index 94% rename from sources/src/main/scala/raw/sources/bytestream/api/DelegatingSeekableInputStream.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/DelegatingSeekableInputStream.scala index 4bf0b2eda..9d59139c5 100644 --- a/sources/src/main/scala/raw/sources/bytestream/api/DelegatingSeekableInputStream.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/DelegatingSeekableInputStream.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api import java.io.EOFException import java.io.IOException @@ -20,8 +20,8 @@ import java.nio.ByteBuffer /** * Implements read methods required by [[SeekableInputStream]] for generic input streams. * - * Implementations must implement [[raw.sources.bytestream.DelegatingSeekableInputStream.getPos()]] - * and [[raw.sources.bytestream.DelegatingSeekableInputStream.seek(long)]] and may optionally + * Implementations must implement [[com.rawlabs.utils.sources.bytestream.DelegatingSeekableInputStream.getPos()]] + * and [[com.rawlabs.utils.sources.bytestream.DelegatingSeekableInputStream.seek(long)]] and may optionally * implement other read methods to improve performance. */ private object DelegatingSeekableInputStream { diff --git a/sources/src/main/scala/raw/sources/bytestream/api/GenericSkippableInputStream.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/GenericSkippableInputStream.scala similarity index 97% rename from sources/src/main/scala/raw/sources/bytestream/api/GenericSkippableInputStream.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/GenericSkippableInputStream.scala index ab9afd58f..e646c9e30 100644 --- a/sources/src/main/scala/raw/sources/bytestream/api/GenericSkippableInputStream.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/GenericSkippableInputStream.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api import java.io.{IOException, InputStream} diff --git a/sources/src/main/scala/raw/sources/bytestream/api/InputStreamClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/InputStreamClient.scala similarity index 91% rename from sources/src/main/scala/raw/sources/bytestream/api/InputStreamClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/InputStreamClient.scala index 3b0fc7745..987bdcd7d 100644 --- a/sources/src/main/scala/raw/sources/bytestream/api/InputStreamClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/InputStreamClient.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api import java.io.InputStream diff --git a/sources/src/main/scala/raw/sources/bytestream/api/SeekableInputStream.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/SeekableInputStream.scala similarity index 95% rename from sources/src/main/scala/raw/sources/bytestream/api/SeekableInputStream.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/SeekableInputStream.scala index f57e5b922..c728b2d42 100644 --- a/sources/src/main/scala/raw/sources/bytestream/api/SeekableInputStream.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/api/SeekableInputStream.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api import java.io.{IOException, InputStream} import java.nio.ByteBuffer diff --git a/sources/src/main/scala/raw/sources/bytestream/github/GitHubLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/github/GitHubLocation.scala similarity index 88% rename from sources/src/main/scala/raw/sources/bytestream/github/GitHubLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/github/GitHubLocation.scala index 525ffc90d..736ae436c 100644 --- a/sources/src/main/scala/raw/sources/bytestream/github/GitHubLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/github/GitHubLocation.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.github +package com.rawlabs.utils.sources.bytestream.github import java.io.InputStream import java.nio.file.Path import com.typesafe.scalalogging.StrictLogging -import raw.sources.bytestream.http.{HttpByteStreamException, HttpByteStreamLocation} -import raw.sources.bytestream.api.{ByteStreamException, ByteStreamLocation, SeekableInputStream} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.bytestream.http.{HttpByteStreamException, HttpByteStreamLocation} +import com.rawlabs.utils.sources.bytestream.api.{ByteStreamException, ByteStreamLocation, SeekableInputStream} +import com.rawlabs.utils.core.RawSettings // Supports only public repositories. class GitHubLocation(val username: String, val repo: String, val file: String, val maybeBranch: Option[String])( diff --git a/sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamClient.scala similarity index 94% rename from sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamClient.scala index 16f7801e4..05d69b43a 100644 --- a/sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamClient.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.http +package com.rawlabs.utils.sources.bytestream.http import com.typesafe.scalalogging.StrictLogging import org.apache.hc.core5.net.URIBuilder -import raw.sources.api.LocationException -import raw.sources.bytestream.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.api.LocationException +import com.rawlabs.utils.sources.bytestream.api._ +import com.rawlabs.utils.core.RawSettings import java.io.{IOException, InputStream} import java.net._ @@ -32,8 +32,8 @@ import scala.collection.mutable object HttpByteStreamClient { - private val HTTP_CONNECT_TIMEOUT = "raw.sources.bytestream.http.connect-timeout" - private val HTTP_READ_TIMEOUT = "raw.sources.bytestream.http.read-timeout" + private val HTTP_CONNECT_TIMEOUT = "raw.utils.sources.bytestream.http.connect-timeout" + private val HTTP_READ_TIMEOUT = "raw.utils.sources.bytestream.http.read-timeout" private val ERROR_RESPONSE_MAX_OUTPUT_SIZE = 2048 diff --git a/sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamException.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamException.scala similarity index 80% rename from sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamException.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamException.scala index b287e4be6..20d87dfc3 100644 --- a/sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamException.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamException.scala @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.http +package com.rawlabs.utils.sources.bytestream.http -import raw.sources.bytestream.api.ByteStreamException +import com.rawlabs.utils.sources.bytestream.api.ByteStreamException class HttpByteStreamException(message: String, cause: Throwable = null) extends ByteStreamException(message, cause) diff --git a/sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamLocation.scala similarity index 92% rename from sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamLocation.scala index b5f7fc866..fa0140198 100644 --- a/sources/src/main/scala/raw/sources/bytestream/http/HttpByteStreamLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/http/HttpByteStreamLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.http +package com.rawlabs.utils.sources.bytestream.http -import raw.sources.bytestream.api.{ByteStreamException, ByteStreamLocation, SeekableInputStream} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.bytestream.api.{ByteStreamException, ByteStreamLocation, SeekableInputStream} +import com.rawlabs.utils.core.RawSettings import java.io.InputStream import java.net.{HttpURLConnection, MalformedURLException, URI, URISyntaxException} diff --git a/sources/src/main/scala/raw/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala index ea08c2c67..bcb0e7a84 100644 --- a/sources/src/main/scala/raw/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/bytestream/inmemory/InMemoryByteStreamLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.inmemory +package com.rawlabs.utils.sources.bytestream.inmemory -import raw.sources.api.LocationException -import raw.sources.bytestream.api.{ +import com.rawlabs.utils.sources.api.LocationException +import com.rawlabs.utils.sources.bytestream.api.{ ByteStreamLocation, DelegatingSeekableInputStream, GenericSkippableInputStream, diff --git a/sources/src/main/scala/raw/sources/filesystem/api/BaseFileSystem.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/BaseFileSystem.scala similarity index 96% rename from sources/src/main/scala/raw/sources/filesystem/api/BaseFileSystem.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/BaseFileSystem.scala index 8fce59607..46af6e57c 100644 --- a/sources/src/main/scala/raw/sources/filesystem/api/BaseFileSystem.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/BaseFileSystem.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.api +package com.rawlabs.utils.sources.filesystem.api import com.typesafe.scalalogging.StrictLogging diff --git a/sources/src/main/scala/raw/sources/filesystem/api/FileSystem.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystem.scala similarity index 92% rename from sources/src/main/scala/raw/sources/filesystem/api/FileSystem.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystem.scala index 9938a2e98..1bc951339 100644 --- a/sources/src/main/scala/raw/sources/filesystem/api/FileSystem.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystem.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.api +package com.rawlabs.utils.sources.filesystem.api import java.io.InputStream -import raw.sources.bytestream.api.InputStreamClient +import com.rawlabs.utils.sources.bytestream.api.InputStreamClient /** * Path conventions: diff --git a/sources/src/main/scala/raw/sources/filesystem/api/FileSystemExceptions.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemExceptions.scala similarity index 94% rename from sources/src/main/scala/raw/sources/filesystem/api/FileSystemExceptions.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemExceptions.scala index 4bdc02959..417fde682 100644 --- a/sources/src/main/scala/raw/sources/filesystem/api/FileSystemExceptions.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemExceptions.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.api +package com.rawlabs.utils.sources.filesystem.api -import raw.sources.bytestream.api.ByteStreamException +import com.rawlabs.utils.sources.bytestream.api.ByteStreamException class FileSystemException(message: String, cause: Throwable = null) extends ByteStreamException(s"file system error: $message", cause) diff --git a/sources/src/main/scala/raw/sources/filesystem/api/FileSystemLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemLocation.scala similarity index 90% rename from sources/src/main/scala/raw/sources/filesystem/api/FileSystemLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemLocation.scala index a513eaedf..724b9f05f 100644 --- a/sources/src/main/scala/raw/sources/filesystem/api/FileSystemLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemLocation.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.api +package com.rawlabs.utils.sources.filesystem.api -import raw.sources.bytestream.api.ByteStreamLocation +import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation trait FileSystemLocation extends ByteStreamLocation { diff --git a/sources/src/main/scala/raw/sources/filesystem/api/FileSystemMetadata.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemMetadata.scala similarity index 93% rename from sources/src/main/scala/raw/sources/filesystem/api/FileSystemMetadata.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemMetadata.scala index ea2b8b4bb..bc8717f1d 100644 --- a/sources/src/main/scala/raw/sources/filesystem/api/FileSystemMetadata.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/api/FileSystemMetadata.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.api +package com.rawlabs.utils.sources.filesystem.api import java.time.Instant diff --git a/sources/src/main/scala/raw/sources/filesystem/dropbox/BaseDropboxPath.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/BaseDropboxPath.scala similarity index 81% rename from sources/src/main/scala/raw/sources/filesystem/dropbox/BaseDropboxPath.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/BaseDropboxPath.scala index 5e999dcc1..d9e64d1c9 100644 --- a/sources/src/main/scala/raw/sources/filesystem/dropbox/BaseDropboxPath.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/BaseDropboxPath.scala @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox import com.dropbox.core.v2.DbxClientV2 -import raw.sources.bytestream.api.{ByteStreamException, SeekableInputStream} -import raw.sources.filesystem.api._ +import com.rawlabs.utils.sources.bytestream.api.{ByteStreamException, SeekableInputStream} +import com.rawlabs.utils.sources.filesystem.api._ import java.io.InputStream import java.nio.file.Path object BaseDropboxPath { - val DROPBOX_CLIENT_ID = "raw.sources.dropbox.clientId" + val DROPBOX_CLIENT_ID = "raw.utils.sources.dropbox.clientId" } abstract class BaseDropboxPath(dbxClientV2: DbxClientV2, path: String) extends FileSystemLocation { diff --git a/sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxAccessTokenPath.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxAccessTokenPath.scala similarity index 88% rename from sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxAccessTokenPath.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxAccessTokenPath.scala index 753fe3939..da37a00be 100644 --- a/sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxAccessTokenPath.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxAccessTokenPath.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox import com.dropbox.core.DbxRequestConfig import com.dropbox.core.oauth.DbxCredential import com.dropbox.core.v2.DbxClientV2 -import raw.sources.filesystem.api.{FileSystemLocation, FileSystemMetadata} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.filesystem.api.{FileSystemLocation, FileSystemMetadata} +import com.rawlabs.utils.core.RawSettings class DropboxAccessTokenPath(val accessToken: String, val path: String, dbxClientV2: DbxClientV2) extends BaseDropboxPath(dbxClientV2, path) { diff --git a/sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxFileSystem.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxFileSystem.scala similarity index 94% rename from sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxFileSystem.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxFileSystem.scala index 98b58c864..ffd85ed17 100644 --- a/sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxFileSystem.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxFileSystem.scala @@ -10,21 +10,25 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox import com.dropbox.core._ import com.dropbox.core.v2.DbxClientV2 import com.dropbox.core.v2.files.{DownloadErrorException, FolderMetadata, Metadata, FileMetadata => DropboxFileMetadata} import org.springframework.util.AntPathMatcher -import raw.sources.bytestream.api.{DelegatingSeekableInputStream, GenericSkippableInputStream, SeekableInputStream} -import raw.sources.filesystem.api._ +import com.rawlabs.utils.sources.bytestream.api.{ + DelegatingSeekableInputStream, + GenericSkippableInputStream, + SeekableInputStream +} +import com.rawlabs.utils.sources.filesystem.api._ import java.io.InputStream import scala.collection.JavaConverters._ import scala.collection.mutable // TODO (msb): Catch unauthorized and throw specific exception? -class DropboxFileSystem(private[raw] val client: DbxClientV2) extends BaseFileSystem { +class DropboxFileSystem(private[rawlabs] val client: DbxClientV2) extends BaseFileSystem { val fileSeparator: String = "/" diff --git a/sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala similarity index 89% rename from sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala index 88887f647..c881b5c7b 100644 --- a/sources/src/main/scala/raw/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/dropbox/DropboxUsernamePasswordPath.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox import com.dropbox.core.DbxRequestConfig import com.dropbox.core.oauth.DbxCredential import com.dropbox.core.v2.DbxClientV2 -import raw.sources.filesystem.api.{FileSystemLocation, FileSystemMetadata} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.filesystem.api.{FileSystemLocation, FileSystemMetadata} +import com.rawlabs.utils.core.RawSettings class DropboxUsernamePasswordPath( val username: String, diff --git a/sources/src/main/scala/raw/sources/filesystem/local/LocalFileSystem.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/local/LocalFileSystem.scala similarity index 95% rename from sources/src/main/scala/raw/sources/filesystem/local/LocalFileSystem.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/local/LocalFileSystem.scala index 69614a33e..28900c0ca 100644 --- a/sources/src/main/scala/raw/sources/filesystem/local/LocalFileSystem.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/local/LocalFileSystem.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.local +package com.rawlabs.utils.sources.filesystem.local import org.springframework.util.AntPathMatcher -import raw.sources.bytestream.api.{DelegatingSeekableInputStream, SeekableInputStream} -import raw.sources.filesystem.api._ -import raw.utils._ +import com.rawlabs.utils.sources.bytestream.api.{DelegatingSeekableInputStream, SeekableInputStream} +import com.rawlabs.utils.sources.filesystem.api._ +import com.rawlabs.utils.core._ import java.io._ import java.nio.file._ diff --git a/sources/src/main/scala/raw/sources/filesystem/local/LocalPath.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/local/LocalPath.scala similarity index 89% rename from sources/src/main/scala/raw/sources/filesystem/local/LocalPath.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/local/LocalPath.scala index cb5c96e57..512cea527 100644 --- a/sources/src/main/scala/raw/sources/filesystem/local/LocalPath.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/local/LocalPath.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.local +package com.rawlabs.utils.sources.filesystem.local import java.io.InputStream import java.nio.file.{Path, Paths} -import raw.sources.bytestream.api.SeekableInputStream -import raw.sources.filesystem.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream +import com.rawlabs.utils.sources.filesystem.api._ class LocalPath(val pathName: String) extends FileSystemLocation { diff --git a/sources/src/main/scala/raw/sources/filesystem/mock/MockPath.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/mock/MockPath.scala similarity index 90% rename from sources/src/main/scala/raw/sources/filesystem/mock/MockPath.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/mock/MockPath.scala index 99d290c54..37129edba 100644 --- a/sources/src/main/scala/raw/sources/filesystem/mock/MockPath.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/mock/MockPath.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.mock +package com.rawlabs.utils.sources.filesystem.mock import com.typesafe.scalalogging.StrictLogging -import raw.sources.bytestream.api.SeekableInputStream -import raw.sources.filesystem.api._ +import com.rawlabs.utils.sources.bytestream.api.SeekableInputStream +import com.rawlabs.utils.sources.filesystem.api._ import java.io.InputStream import java.lang.StackWalker.StackFrame diff --git a/sources/src/main/scala/raw/sources/filesystem/s3/S3FileSystem.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3FileSystem.scala similarity index 96% rename from sources/src/main/scala/raw/sources/filesystem/s3/S3FileSystem.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3FileSystem.scala index 35b5a4f98..55ee10372 100644 --- a/sources/src/main/scala/raw/sources/filesystem/s3/S3FileSystem.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3FileSystem.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.s3 +package com.rawlabs.utils.sources.filesystem.s3 import software.amazon.awssdk.regions.Region import software.amazon.awssdk.services.s3.S3Client @@ -19,9 +19,13 @@ import software.amazon.awssdk.services.s3.S3Configuration import java.net.ConnectException import com.google.common.collect.AbstractIterator import org.springframework.util.AntPathMatcher -import raw.sources.bytestream.api.{DelegatingSeekableInputStream, GenericSkippableInputStream, SeekableInputStream} -import raw.sources.filesystem.api._ -import raw.utils._ +import com.rawlabs.utils.sources.bytestream.api.{ + DelegatingSeekableInputStream, + GenericSkippableInputStream, + SeekableInputStream +} +import com.rawlabs.utils.sources.filesystem.api._ +import com.rawlabs.utils.core._ import software.amazon.awssdk.auth.credentials.{ AnonymousCredentialsProvider, AwsBasicCredentials, @@ -45,10 +49,10 @@ import java.util.concurrent.TimeUnit import scala.collection.JavaConverters._ object S3FileSystem { - private val CONNECT_TIMEOUT = "raw.sources.s3.connect-timeout" - private val READ_TIMEOUT = "raw.sources.s3.read-timeout" - private val MAX_CONNECTIONS = "raw.sources.s3.max-connections" - private val DEFAULT_REGION = "raw.sources.s3.default-region" + private val CONNECT_TIMEOUT = "raw.utils.sources.s3.connect-timeout" + private val READ_TIMEOUT = "raw.utils.sources.s3.read-timeout" + private val MAX_CONNECTIONS = "raw.utils.sources.s3.max-connections" + private val DEFAULT_REGION = "raw.utils.sources.s3.default-region" } class S3FileSystem( diff --git a/sources/src/main/scala/raw/sources/filesystem/s3/S3InputStream.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3InputStream.scala similarity index 97% rename from sources/src/main/scala/raw/sources/filesystem/s3/S3InputStream.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3InputStream.scala index 55f9b5469..0cdfc0a70 100644 --- a/sources/src/main/scala/raw/sources/filesystem/s3/S3InputStream.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3InputStream.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.s3 +package com.rawlabs.utils.sources.filesystem.s3 import software.amazon.awssdk.core.ResponseInputStream import software.amazon.awssdk.services.s3.model.GetObjectResponse diff --git a/sources/src/main/scala/raw/sources/filesystem/s3/S3Path.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3Path.scala similarity index 87% rename from sources/src/main/scala/raw/sources/filesystem/s3/S3Path.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3Path.scala index 7f25b0b26..08e312b0e 100644 --- a/sources/src/main/scala/raw/sources/filesystem/s3/S3Path.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/filesystem/s3/S3Path.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.s3 +package com.rawlabs.utils.sources.filesystem.s3 -import raw.sources.bytestream.api.{ByteStreamException, SeekableInputStream} -import raw.sources.filesystem.api.{FileSystemLocation, FileSystemMetadata} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.bytestream.api.{ByteStreamException, SeekableInputStream} +import com.rawlabs.utils.sources.filesystem.api.{FileSystemLocation, FileSystemMetadata} +import com.rawlabs.utils.core.RawSettings import java.io.InputStream import java.nio.file.Path diff --git a/sources/src/main/scala/raw/sources/jdbc/api/JdbcClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcClient.scala similarity index 95% rename from sources/src/main/scala/raw/sources/jdbc/api/JdbcClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcClient.scala index bbdf32a59..d21ffa081 100644 --- a/sources/src/main/scala/raw/sources/jdbc/api/JdbcClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcClient.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.api +package com.rawlabs.utils.sources.jdbc.api import java.io.Closeable import java.sql.{Connection, DriverManager, ResultSet} import java.util.concurrent.{Executors, TimeUnit} import com.typesafe.scalalogging.StrictLogging -import raw.utils.RawSettings +import com.rawlabs.utils.core.RawSettings import scala.collection.mutable @@ -44,10 +44,10 @@ final case class NativeIntervalType(nullable: Boolean) extends TableColumnType case object UnsupportedColumnType extends TableColumnType object JdbcClient { - private val CONNECT_TIMEOUT = "raw.sources.rdbms.connect-timeout" - private val READ_TIMEOUT = "raw.sources.rdbms.read-timeout" - private val NETWORK_TIMEOUT = "raw.sources.rdbms.network-timeout" - private val LOGIN_TIMEOUT = "raw.sources.rdbms.login-timeout" + private val CONNECT_TIMEOUT = "raw.utils.sources.rdbms.connect-timeout" + private val READ_TIMEOUT = "raw.utils.sources.rdbms.read-timeout" + private val NETWORK_TIMEOUT = "raw.utils.sources.rdbms.network-timeout" + private val LOGIN_TIMEOUT = "raw.utils.sources.rdbms.login-timeout" } abstract class JdbcClient()(implicit settings: RawSettings) extends StrictLogging { diff --git a/sources/src/main/scala/raw/sources/jdbc/api/JdbcLocationExceptions.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcLocationExceptions.scala similarity index 91% rename from sources/src/main/scala/raw/sources/jdbc/api/JdbcLocationExceptions.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcLocationExceptions.scala index d6a34f3df..6bc7249d8 100644 --- a/sources/src/main/scala/raw/sources/jdbc/api/JdbcLocationExceptions.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcLocationExceptions.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.api +package com.rawlabs.utils.sources.jdbc.api -import raw.sources.api.LocationException +import com.rawlabs.utils.sources.api.LocationException class JdbcLocationException(message: String, cause: Throwable = null) extends LocationException(message, cause) diff --git a/sources/src/main/scala/raw/sources/jdbc/api/JdbcSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcSchemaLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/api/JdbcSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcSchemaLocation.scala index 0e81ddf69..9fc506388 100644 --- a/sources/src/main/scala/raw/sources/jdbc/api/JdbcSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcSchemaLocation.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.api +package com.rawlabs.utils.sources.jdbc.api -import raw.sources.api.Location +import com.rawlabs.utils.sources.api.Location import java.io.Closeable diff --git a/sources/src/main/scala/raw/sources/jdbc/api/JdbcServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcServerLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/api/JdbcServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcServerLocation.scala index 1c96eadee..2e7f61862 100644 --- a/sources/src/main/scala/raw/sources/jdbc/api/JdbcServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcServerLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.api +package com.rawlabs.utils.sources.jdbc.api import java.sql.Connection -import raw.sources.api.Location +import com.rawlabs.utils.sources.api.Location import java.io.Closeable diff --git a/sources/src/main/scala/raw/sources/jdbc/api/JdbcTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcTableLocation.scala similarity index 88% rename from sources/src/main/scala/raw/sources/jdbc/api/JdbcTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcTableLocation.scala index 7097a96be..12a32a2bd 100644 --- a/sources/src/main/scala/raw/sources/jdbc/api/JdbcTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/api/JdbcTableLocation.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.api +package com.rawlabs.utils.sources.jdbc.api -import raw.sources.api.Location +import com.rawlabs.utils.sources.api.Location abstract class JdbcTableLocation( val jdbcClient: JdbcClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlClient.scala similarity index 96% rename from sources/src/main/scala/raw/sources/jdbc/mysql/MySqlClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlClient.scala index dab2f585b..1e50eb6a2 100644 --- a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlClient.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.mysql +package com.rawlabs.utils.sources.jdbc.mysql import com.mysql.cj.exceptions.CJCommunicationsException import java.util.concurrent.TimeUnit -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings import java.net.{SocketTimeoutException, UnknownHostException} import java.sql.SQLException diff --git a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlSchemaLocation.scala similarity index 88% rename from sources/src/main/scala/raw/sources/jdbc/mysql/MySqlSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlSchemaLocation.scala index 9bc34ea23..479150321 100644 --- a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.mysql +package com.rawlabs.utils.sources.jdbc.mysql import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class MySqlSchemaLocation private (cli: MySqlClient) extends JdbcSchemaLocation(cli, None) { diff --git a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlServerLocation.scala similarity index 86% rename from sources/src/main/scala/raw/sources/jdbc/mysql/MySqlServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlServerLocation.scala index 7e0340295..b8cd1d10b 100644 --- a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlServerLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.mysql +package com.rawlabs.utils.sources.jdbc.mysql import java.io.Closeable -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings class MySqlServerLocation( val host: String, diff --git a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlTableLocation.scala similarity index 86% rename from sources/src/main/scala/raw/sources/jdbc/mysql/MySqlTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlTableLocation.scala index 02743af91..0ce100a46 100644 --- a/sources/src/main/scala/raw/sources/jdbc/mysql/MySqlTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/mysql/MySqlTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.mysql +package com.rawlabs.utils.sources.jdbc.mysql -import raw.sources.jdbc.api.JdbcTableLocation -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.utils.core.RawSettings class MySqlTableLocation(cli: MySqlClient, val table: String) extends JdbcTableLocation(cli, None, table) { diff --git a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleClient.scala similarity index 98% rename from sources/src/main/scala/raw/sources/jdbc/oracle/OracleClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleClient.scala index 5434b2cf4..3c3814eb6 100644 --- a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleClient.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.oracle +package com.rawlabs.utils.sources.jdbc.oracle import oracle.net.ns.NetException -import raw.utils.RawSettings -import raw.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ import java.io.Closeable import java.net.{ConnectException, SocketTimeoutException, UnknownHostException} diff --git a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleSchemaLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/oracle/OracleSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleSchemaLocation.scala index a09c2bef7..38be482dc 100644 --- a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.oracle +package com.rawlabs.utils.sources.jdbc.oracle import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class OracleSchemaLocation( cli: OracleClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleServerLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/oracle/OracleServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleServerLocation.scala index ea91af591..b34b1256c 100644 --- a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleServerLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.oracle +package com.rawlabs.utils.sources.jdbc.oracle import java.io.Closeable -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings class OracleServerLocation( val host: String, diff --git a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleTableLocation.scala similarity index 87% rename from sources/src/main/scala/raw/sources/jdbc/oracle/OracleTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleTableLocation.scala index 6aef95b0e..991fe9dc9 100644 --- a/sources/src/main/scala/raw/sources/jdbc/oracle/OracleTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/oracle/OracleTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.oracle +package com.rawlabs.utils.sources.jdbc.oracle -import raw.sources.jdbc.api.JdbcTableLocation -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.utils.core.RawSettings class OracleTableLocation( cli: OracleClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlClient.scala similarity index 96% rename from sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlClient.scala index 1b45f6f36..035fa58c3 100644 --- a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlClient.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.pgsql +package com.rawlabs.utils.sources.jdbc.pgsql import org.postgresql.util.PSQLException import java.util.concurrent.TimeUnit -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings import java.net.{SocketTimeoutException, UnknownHostException} import scala.util.control.NonFatal diff --git a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala index 810d13cfa..a56bb63fe 100644 --- a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.pgsql +package com.rawlabs.utils.sources.jdbc.pgsql import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class PostgresqlSchemaLocation( cli: PostgresqlClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlServerLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlServerLocation.scala index 1273e3d46..4678c9a45 100644 --- a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlServerLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.pgsql +package com.rawlabs.utils.sources.jdbc.pgsql import java.io.Closeable -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings class PostgresqlServerLocation( val host: String, diff --git a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlTableLocation.scala similarity index 87% rename from sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlTableLocation.scala index 9915ba1c1..d0199190d 100644 --- a/sources/src/main/scala/raw/sources/jdbc/pgsql/PostgresqlTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/pgsql/PostgresqlTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.pgsql +package com.rawlabs.utils.sources.jdbc.pgsql -import raw.sources.jdbc.api.JdbcTableLocation -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.utils.core.RawSettings class PostgresqlTableLocation( cli: PostgresqlClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeClient.scala similarity index 96% rename from sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeClient.scala index a476898a9..1aad32b68 100644 --- a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeClient.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.snowflake +package com.rawlabs.utils.sources.jdbc.snowflake import net.snowflake.client.jdbc.SnowflakeSQLException import net.snowflake.client.jdbc.internal.snowflake.common.core.SqlState -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings import java.sql.{Connection, DriverManager} import java.util.concurrent.{Executors, TimeUnit} diff --git a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala similarity index 90% rename from sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala index 09c9d69c6..987cadef0 100644 --- a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.snowflake +package com.rawlabs.utils.sources.jdbc.snowflake import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class SnowflakeSchemaLocation( cli: SnowflakeClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeServerLocation.scala similarity index 92% rename from sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeServerLocation.scala index 8b08bb87c..78b9a8d7f 100644 --- a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeServerLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.snowflake +package com.rawlabs.utils.sources.jdbc.snowflake import java.io.Closeable -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings import scala.collection.JavaConverters._ class SnowflakeServerLocation( diff --git a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeTableLocation.scala similarity index 91% rename from sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeTableLocation.scala index 28159eff0..860c961ba 100644 --- a/sources/src/main/scala/raw/sources/jdbc/snowflake/SnowflakeTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/snowflake/SnowflakeTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.snowflake +package com.rawlabs.utils.sources.jdbc.snowflake -import raw.sources.jdbc.api.JdbcTableLocation -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.utils.core.RawSettings import scala.collection.JavaConverters._ diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteClient.scala similarity index 94% rename from sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteClient.scala index c515f7d8a..c3ff6e3d0 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteClient.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlite +package com.rawlabs.utils.sources.jdbc.sqlite -import raw.sources.api.LocationException -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.api.LocationException +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings import java.nio.file.{InvalidPathException, Path, Paths} import java.sql.SQLException diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteSchemaLocation.scala similarity index 85% rename from sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteSchemaLocation.scala index 8232a6425..9111f5d60 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlite +package com.rawlabs.utils.sources.jdbc.sqlite import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class SqliteSchemaLocation( cli: SqliteClient diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteServerLocation.scala similarity index 83% rename from sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteServerLocation.scala index d4d508d0e..4b3ddab13 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteServerLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlite +package com.rawlabs.utils.sources.jdbc.sqlite import java.io.Closeable -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings class SqliteServerLocation(val path: String)( implicit settings: RawSettings diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteTableLocation.scala similarity index 83% rename from sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteTableLocation.scala index d33a263b4..a65937a4e 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlite/SqliteTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlite/SqliteTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlite +package com.rawlabs.utils.sources.jdbc.sqlite -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings class SqliteTableLocation( cli: SqliteClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerClient.scala similarity index 96% rename from sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerClient.scala index 598c8b5f4..b07161055 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerClient.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlserver +package com.rawlabs.utils.sources.jdbc.sqlserver import com.microsoft.sqlserver.jdbc.SQLServerException import java.util.concurrent.TimeUnit -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings import java.net.{SocketTimeoutException, UnknownHostException} import scala.util.control.NonFatal diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala similarity index 88% rename from sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala index 6490022c5..9bfff4924 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlserver +package com.rawlabs.utils.sources.jdbc.sqlserver import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class SqlServerSchemaLocation( cli: SqlServerClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerServerLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerServerLocation.scala index 192c51866..180ae1e4d 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerServerLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlserver +package com.rawlabs.utils.sources.jdbc.sqlserver import java.io.Closeable -import raw.sources.jdbc.api._ -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings class SqlServerServerLocation( val host: String, diff --git a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerTableLocation.scala similarity index 87% rename from sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerTableLocation.scala index a130fe51a..36f650766 100644 --- a/sources/src/main/scala/raw/sources/jdbc/sqlserver/SqlServerTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/sqlserver/SqlServerTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.sqlserver +package com.rawlabs.utils.sources.jdbc.sqlserver -import raw.sources.jdbc.api.JdbcTableLocation -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.utils.core.RawSettings class SqlServerTableLocation( cli: SqlServerClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataClient.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataClient.scala similarity index 97% rename from sources/src/main/scala/raw/sources/jdbc/teradata/TeradataClient.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataClient.scala index 80eca236d..12ece0718 100644 --- a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataClient.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataClient.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.teradata +package com.rawlabs.utils.sources.jdbc.teradata -import raw.utils.RawSettings -import raw.sources.jdbc.api._ +import com.rawlabs.utils.core.RawSettings +import com.rawlabs.utils.sources.jdbc.api._ import java.net.{NoRouteToHostException, SocketTimeoutException, UnknownHostException} import java.sql.{Connection, DriverManager, ResultSetMetaData, SQLException} diff --git a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataSchemaLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataSchemaLocation.scala similarity index 89% rename from sources/src/main/scala/raw/sources/jdbc/teradata/TeradataSchemaLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataSchemaLocation.scala index d06133893..7c077e8bc 100644 --- a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataSchemaLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataSchemaLocation.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.teradata +package com.rawlabs.utils.sources.jdbc.teradata import java.io.Closeable -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcTableLocation} +import com.rawlabs.utils.core.RawSettings class TeradataSchemaLocation( cli: TeradataClient, diff --git a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataServerLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataServerLocation.scala similarity index 87% rename from sources/src/main/scala/raw/sources/jdbc/teradata/TeradataServerLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataServerLocation.scala index 766589348..3c382b7f0 100644 --- a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataServerLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataServerLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.teradata +package com.rawlabs.utils.sources.jdbc.teradata -import raw.sources.jdbc.api.{JdbcSchemaLocation, JdbcServerLocation} -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.{JdbcSchemaLocation, JdbcServerLocation} +import com.rawlabs.utils.core.RawSettings import java.io.Closeable diff --git a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataTableLocation.scala b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataTableLocation.scala similarity index 88% rename from sources/src/main/scala/raw/sources/jdbc/teradata/TeradataTableLocation.scala rename to utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataTableLocation.scala index 471b324de..3786f9975 100644 --- a/sources/src/main/scala/raw/sources/jdbc/teradata/TeradataTableLocation.scala +++ b/utils-sources/src/main/scala/com/rawlabs/utils/sources/jdbc/teradata/TeradataTableLocation.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.jdbc.teradata +package com.rawlabs.utils.sources.jdbc.teradata -import raw.sources.jdbc.api.JdbcTableLocation -import raw.utils.RawSettings +import com.rawlabs.utils.sources.jdbc.api.JdbcTableLocation +import com.rawlabs.utils.core.RawSettings class TeradataTableLocation( cli: TeradataClient, diff --git a/sources/src/test/scala/raw/sources/bytestream/api/TestGenericSkippableInputStream.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/api/TestGenericSkippableInputStream.scala similarity index 96% rename from sources/src/test/scala/raw/sources/bytestream/api/TestGenericSkippableInputStream.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/api/TestGenericSkippableInputStream.scala index 23800cc89..c2ba042bd 100644 --- a/sources/src/test/scala/raw/sources/bytestream/api/TestGenericSkippableInputStream.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/api/TestGenericSkippableInputStream.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.api +package com.rawlabs.utils.sources.bytestream.api import java.io.{ByteArrayInputStream, IOException} import org.scalatest.funsuite.AnyFunSuite diff --git a/sources/src/test/scala/raw/sources/bytestream/http/HttpLocationsTestContext.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/http/HttpLocationsTestContext.scala similarity index 93% rename from sources/src/test/scala/raw/sources/bytestream/http/HttpLocationsTestContext.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/http/HttpLocationsTestContext.scala index 579bd01e7..b8dd6e1e5 100644 --- a/sources/src/test/scala/raw/sources/bytestream/http/HttpLocationsTestContext.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/http/HttpLocationsTestContext.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.http +package com.rawlabs.utils.sources.bytestream.http trait HttpLocationsTestContext { diff --git a/sources/src/test/scala/raw/sources/bytestream/http/TestHttpServer.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/http/TestHttpServer.scala similarity index 97% rename from sources/src/test/scala/raw/sources/bytestream/http/TestHttpServer.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/http/TestHttpServer.scala index dc7604754..b1f35fd6d 100644 --- a/sources/src/test/scala/raw/sources/bytestream/http/TestHttpServer.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/bytestream/http/TestHttpServer.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package raw.sources.bytestream.http +package com.rawlabs.utils.sources.bytestream.http import com.sun.net.httpserver.{Authenticator, BasicAuthenticator, HttpExchange, HttpHandler, HttpServer} import com.typesafe.scalalogging.StrictLogging diff --git a/sources/src/test/scala/raw/sources/filesystem/api/TestFileSystems.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/api/TestFileSystems.scala similarity index 98% rename from sources/src/test/scala/raw/sources/filesystem/api/TestFileSystems.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/api/TestFileSystems.scala index a18d93841..d1812dd82 100644 --- a/sources/src/test/scala/raw/sources/filesystem/api/TestFileSystems.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/api/TestFileSystems.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.api +package com.rawlabs.utils.sources.filesystem.api import com.typesafe.scalalogging.StrictLogging import org.scalatest.BeforeAndAfterAll -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} trait TestFileSystems extends SettingsTestContext with BeforeAndAfterAll with StrictLogging { this: RawTestSuite => diff --git a/sources/src/test/scala/raw/sources/filesystem/dropbox/TestDropboxFileSystem.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/TestDropboxFileSystem.scala similarity index 88% rename from sources/src/test/scala/raw/sources/filesystem/dropbox/TestDropboxFileSystem.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/TestDropboxFileSystem.scala index 74e7f329c..40f2ec4de 100644 --- a/sources/src/test/scala/raw/sources/filesystem/dropbox/TestDropboxFileSystem.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/TestDropboxFileSystem.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox import com.dropbox.core.DbxRequestConfig import com.dropbox.core.oauth.DbxCredential import com.dropbox.core.v2.DbxClientV2 -import raw.utils.RawTestSuite -import raw.sources.filesystem.api.{FileSystem, TestFileSystems} +import com.rawlabs.utils.core.RawTestSuite +import com.rawlabs.utils.sources.filesystem.api.{FileSystem, TestFileSystems} import java.io.ByteArrayInputStream import scala.util.Try diff --git a/sources/src/test/scala/raw/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala similarity index 89% rename from sources/src/test/scala/raw/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala index 49ffadb4a..e7b1ebf09 100644 --- a/sources/src/test/scala/raw/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/dropbox/TestRootDropboxFileSystem.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.dropbox +package com.rawlabs.utils.sources.filesystem.dropbox import com.dropbox.core.DbxRequestConfig import com.dropbox.core.oauth.DbxCredential import com.dropbox.core.v2.DbxClientV2 import com.typesafe.scalalogging.StrictLogging -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} class TestRootDropboxFileSystem extends RawTestSuite with SettingsTestContext with StrictLogging { diff --git a/sources/src/test/scala/raw/sources/filesystem/local/TestLocalFileSystem.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/local/TestLocalFileSystem.scala similarity index 83% rename from sources/src/test/scala/raw/sources/filesystem/local/TestLocalFileSystem.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/local/TestLocalFileSystem.scala index 8b9fc43a3..75c4df9ab 100644 --- a/sources/src/test/scala/raw/sources/filesystem/local/TestLocalFileSystem.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/local/TestLocalFileSystem.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.local +package com.rawlabs.utils.sources.filesystem.local import java.io.File -import raw.utils.RawTestSuite -import raw.sources.filesystem.api.{FileSystem, TestFileSystems} +import com.rawlabs.utils.core.RawTestSuite +import com.rawlabs.utils.sources.filesystem.api.{FileSystem, TestFileSystems} import java.nio.file.Files diff --git a/sources/src/test/scala/raw/sources/filesystem/s3/TestLargeDirectory.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestLargeDirectory.scala similarity index 92% rename from sources/src/test/scala/raw/sources/filesystem/s3/TestLargeDirectory.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestLargeDirectory.scala index 53573b820..bab64b452 100644 --- a/sources/src/test/scala/raw/sources/filesystem/s3/TestLargeDirectory.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestLargeDirectory.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.s3 +package com.rawlabs.utils.sources.filesystem.s3 import com.typesafe.scalalogging.StrictLogging import org.scalatest.BeforeAndAfterAll -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} import scala.collection.mutable diff --git a/sources/src/test/scala/raw/sources/filesystem/s3/TestRootS3FileSystem.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestRootS3FileSystem.scala similarity index 94% rename from sources/src/test/scala/raw/sources/filesystem/s3/TestRootS3FileSystem.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestRootS3FileSystem.scala index 6ab049e6d..d5a04d855 100644 --- a/sources/src/test/scala/raw/sources/filesystem/s3/TestRootS3FileSystem.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestRootS3FileSystem.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.s3 +package com.rawlabs.utils.sources.filesystem.s3 import com.typesafe.scalalogging.StrictLogging -import raw.utils.{RawTestSuite, SettingsTestContext} +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} class TestRootS3FileSystem extends RawTestSuite with SettingsTestContext with StrictLogging { diff --git a/sources/src/test/scala/raw/sources/filesystem/s3/TestS3FileSystem.scala b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestS3FileSystem.scala similarity index 94% rename from sources/src/test/scala/raw/sources/filesystem/s3/TestS3FileSystem.scala rename to utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestS3FileSystem.scala index 1d8392c1f..a0ff8e28a 100644 --- a/sources/src/test/scala/raw/sources/filesystem/s3/TestS3FileSystem.scala +++ b/utils-sources/src/test/scala/com/rawlabs/utils/sources/filesystem/s3/TestS3FileSystem.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package raw.sources.filesystem.s3 +package com.rawlabs.utils.sources.filesystem.s3 -import raw.utils.RawTestSuite -import raw.sources.filesystem.api.{FileSystem, TestFileSystems} +import com.rawlabs.utils.core.RawTestSuite +import com.rawlabs.utils.sources.filesystem.api.{FileSystem, TestFileSystems} import software.amazon.awssdk.auth.credentials.{AwsBasicCredentials, StaticCredentialsProvider} import software.amazon.awssdk.core.exception.SdkClientException import software.amazon.awssdk.core.sync.RequestBody @@ -102,7 +102,7 @@ class TestNoForwardSlashS3FileSystem extends RawTestSuite with TestS3FileSystem } class TestRootOfBucketS3FileSystem extends RawTestSuite with TestS3FileSystem { - override val bucketName = "rawlabs-unit-tests\"" + override val bucketName = "rawlabs-unit-tests" override val bucketRegion = "eu-west-1" override val bucketAccessKey = sys.env("RAW_AWS_ACCESS_KEY_ID") override val bucketSecretKey = sys.env("RAW_AWS_SECRET_ACCESS_KEY") diff --git a/utils/src/test/java/raw/testing/tags/Tier1.java b/utils/src/test/java/raw/testing/tags/Tier1.java deleted file mode 100644 index fd273b4d5..000000000 --- a/utils/src/test/java/raw/testing/tags/Tier1.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.testing.tags; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.scalatest.TagAnnotation; - -@TagAnnotation -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface Tier1 {} diff --git a/utils/src/test/java/raw/testing/tags/TruffleTests.java b/utils/src/test/java/raw/testing/tags/TruffleTests.java deleted file mode 100644 index 7fb6ba58a..000000000 --- a/utils/src/test/java/raw/testing/tags/TruffleTests.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.testing.tags; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.scalatest.TagAnnotation; - -@TagAnnotation -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD, ElementType.TYPE}) -public @interface TruffleTests {} diff --git a/utils/src/test/scala/raw/utils/Tags.scala b/utils/src/test/scala/raw/utils/Tags.scala deleted file mode 100644 index 951628a6f..000000000 --- a/utils/src/test/scala/raw/utils/Tags.scala +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package raw.utils - -import org.scalatest.Tag - -/** - * Represents a test that performs actions against a database instance. - */ -object DbTest extends Tag("raw.testing.tags.DbAccessTest") - -/** - * Represents a test that performs actions against an external network. - */ -object NetworkTest extends Tag("raw.testing.tags.NetworkAccessTest") - -/** - * Represents a test that performs actions against a raw executor instance. - */ -object ExecutorTest extends Tag("raw.testing.tags.ExecutorAccessTest") - -/** - * Represents a test that performs actions against some entity inside a protected network. - */ - -object VPNTest extends Tag("raw.testing.tags.VPNAccessTest") From d66f94abef69d987a7f291ace64fe5f676c8ddcf Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Fri, 23 Aug 2024 09:27:06 +0200 Subject: [PATCH 3/7] Aesthetics (#492) --- build.sbt | 26 +- compiler/src/main/java/module-info.java | 1 + .../rawlabs/compiler/CompilerService.scala | 43 +- .../compiler/CompilerServiceTestContext.scala | 11 +- project/GenParserPlugin.scala | 71 +- .../src/main/java/module-info.java | 1 + .../com/rawlabs/protocol/compiler/docs.proto | 67 ++ .../{protocol.proto => location_config.proto} | 0 .../rawlabs/protocol/compiler/messages.proto | 40 + .../compiler/program_description.proto | 49 + .../compiler/program_environment.proto | 40 + snapi-compiler/src/main/java/module-info.java | 5 +- ...om.rawlabs.compiler.CompilerServiceBuilder | 2 +- .../snapi/compiler/Rql2CompilerService.scala | 695 +++++++++++++- ...scala => Rql2CompilerServiceBuilder.scala} | 6 +- .../compiler/Rql2TruffleCompilerService.scala | 718 -------------- .../compiler/writers/Rql2CsvWriter.scala | 2 +- .../compiler/writers/Rql2JsonWriter.scala | 2 +- ...a => Rql2CompilerServiceTestContext.scala} | 10 +- .../{api => }/Rql2OutputTestContext.scala | 4 +- ...estContext.scala => Rql2TestContext.scala} | 12 +- .../tests/benchmark/BenchmarkTests.scala | 4 +- .../tests/benchmark/StressTests.scala | 4 +- .../tests/builtin/BinaryPackageTest.scala | 6 +- .../tests/builtin/BytePackageTest.scala | 4 +- .../tests/builtin/CsvPackageTest.scala | 6 +- .../tests/builtin/DatePackageTest.scala | 4 +- .../tests/builtin/DecimalPackageTest.scala | 4 +- .../tests/builtin/DoublePackageTest.scala | 4 +- .../builtin/EnvironmentPackageTest.scala | 4 +- .../tests/builtin/ErrorPackageTest.scala | 4 +- .../tests/builtin/FloatPackageTest.scala | 4 +- .../tests/builtin/FunctionPackageTest.scala | 4 +- .../tests/builtin/HttpPackageTest.scala | 4 +- .../tests/builtin/IntPackageTest.scala | 4 +- .../tests/builtin/IntervalPackageTest.scala | 4 +- .../tests/builtin/JsonPackageTest.scala | 6 +- .../tests/builtin/LocationPackageTest.scala | 6 +- .../tests/builtin/LongPackageTest.scala | 4 +- .../tests/builtin/MathPackageTest.scala | 4 +- .../tests/builtin/NullablePackageTest.scala | 4 +- .../builtin/NullableTryablePackageTest.scala | 4 +- .../tests/builtin/RecordPackageTest.scala | 4 +- .../tests/builtin/RegexPackageTest.scala | 4 +- .../tests/builtin/S3PackageTest.scala | 4 +- .../tests/builtin/ShortPackageTest.scala | 4 +- .../tests/builtin/StringPackageTest.scala | 6 +- .../tests/builtin/SuccessPackageTest.scala | 4 +- .../tests/builtin/TimePackageTest.scala | 4 +- .../tests/builtin/TimestampPackageTest.scala | 4 +- .../tests/builtin/TryPackageTest.scala | 4 +- .../tests/builtin/TypePackageTest.scala | 6 +- .../tests/builtin/XmlPackageTest.scala | 6 +- .../collection/CollectionDistinctTest.scala | 4 +- .../collection/CollectionExplodeTest.scala | 6 +- .../collection/CollectionGroupByTest.scala | 6 +- .../collection/CollectionJoinTest.scala | 6 +- .../collection/CollectionMinMaxTest.scala | 4 +- .../collection/CollectionMkStringTest.scala | 4 +- .../collection/CollectionOrderByTest.scala | 6 +- .../collection/CollectionPackageTest.scala | 6 +- .../collection/CollectionRangeTest.scala | 4 +- .../collection/CollectionUnionTest.scala | 6 +- .../builtin/credentials/AwsPackageTest.scala | 4 +- .../credentials/EnvironmentPackageTest.scala | 4 +- .../credentials/LocationPackageTest.scala | 4 +- .../credentials/MySQLPackageTest.scala | 4 +- .../credentials/OraclePackageTest.scala | 4 +- .../credentials/PostgreSQLPackageTest.scala | 4 +- .../builtin/credentials/S3PackageTest.scala | 4 +- .../credentials/SQLServerPackageTest.scala | 4 +- .../credentials/SnowflakePackageTest.scala | 4 +- .../tests/builtin/list/ListDistinctTest.scala | 4 +- .../tests/builtin/list/ListExplodeTest.scala | 6 +- .../tests/builtin/list/ListGroupByTest.scala | 6 +- .../tests/builtin/list/ListJoinTest.scala | 6 +- .../tests/builtin/list/ListMinMaxTest.scala | 4 +- .../tests/builtin/list/ListMkStringTest.scala | 4 +- .../tests/builtin/list/ListOrderByTest.scala | 6 +- .../tests/builtin/list/ListPackageTest.scala | 6 +- .../tests/builtin/list/ListUnionTest.scala | 6 +- .../hints/SemanticAnalyzerHintsTest.scala | 4 +- .../tests/lsp/LspAiValidateTest.scala | 4 +- .../tests/lsp/LspBrokenCodeTest.scala | 4 +- .../tests/lsp/LspCommentsFormatTest.scala | 4 +- .../lsp/LspCompilationMessagesTest.scala | 4 +- .../tests/lsp/LspDefinitionTest.scala | 4 +- .../tests/lsp/LspDotAutoCompleteTest.scala | 4 +- .../tests/lsp/LspFormatCodeTest.scala | 4 +- .../compiler/tests/lsp/LspHoverTest.scala | 4 +- .../compiler/tests/lsp/LspRenameTest.scala | 4 +- .../compiler/tests/lsp/LspValidateTest.scala | 4 +- .../tests/lsp/LspWordAutoCompleteTest.scala | 4 +- .../tests/offheap/KryoPackageTest.scala | 4 +- .../tests/offheap/OffHeapDatasets.scala | 6 +- .../tests/offheap/OffHeapDistinctTest.scala | 6 +- .../tests/offheap/OffHeapEquiJoinTest.scala | 6 +- .../tests/offheap/OffHeapGroupTest.scala | 6 +- .../tests/offheap/OffHeapJoinTest.scala | 6 +- .../tests/offheap/OffHeapOrderByTest.scala | 6 +- .../tests/output/BinaryOutputTest.scala | 4 +- .../compiler/tests/output/CsvOutputTest.scala | 6 +- .../tests/output/JsonOutputTest.scala | 4 +- .../tests/output/TextOutputTest.scala | 4 +- .../parser/FrontendSyntaxAnalyzerTest.scala | 4 +- .../compiler/tests/parser/ListSugarTest.scala | 4 +- .../tests/parser/OperatorPrecedenceTest.scala | 6 +- .../tests/parser/RecordSugarTest.scala | 4 +- .../tests/regressions/RD10194Test.scala | 4 +- .../tests/regressions/RD10220Test.scala | 4 +- .../tests/regressions/RD10723Test.scala | 4 +- .../tests/regressions/RD10767Test.scala | 6 +- .../tests/regressions/RD10801Test.scala | 6 +- .../tests/regressions/RD3742Test.scala | 4 +- .../tests/regressions/RD3784Test.scala | 6 +- .../tests/regressions/RD4529Test.scala | 4 +- .../tests/regressions/RD4981Test.scala | 6 +- .../tests/regressions/RD5238Test.scala | 6 +- .../tests/regressions/RD5365Test.scala | 4 +- .../tests/regressions/RD5393Test.scala | 4 +- .../tests/regressions/RD5412Test.scala | 4 +- .../tests/regressions/RD5448Test.scala | 6 +- .../tests/regressions/RD5484Test.scala | 4 +- .../tests/regressions/RD5488Test.scala | 4 +- .../tests/regressions/RD5491Test.scala | 4 +- .../tests/regressions/RD5644Test.scala | 4 +- .../tests/regressions/RD5679Test.scala | 6 +- .../tests/regressions/RD5685Test.scala | 4 +- .../tests/regressions/RD5691Test.scala | 4 +- .../tests/regressions/RD5697Test.scala | 6 +- .../tests/regressions/RD5714Test.scala | 4 +- .../tests/regressions/RD5722Test.scala | 4 +- .../tests/regressions/RD572Test.scala | 4 +- .../tests/regressions/RD5775Test.scala | 4 +- .../tests/regressions/RD5779Test.scala | 6 +- .../tests/regressions/RD5784Test.scala | 6 +- .../tests/regressions/RD5785Test.scala | 4 +- .../tests/regressions/RD5786Test.scala | 4 +- .../tests/regressions/RD5851Test.scala | 4 +- .../tests/regressions/RD5884Test.scala | 4 +- .../tests/regressions/RD5893Test.scala | 6 +- .../tests/regressions/RD5914Test.scala | 4 +- .../tests/regressions/RD5920Test.scala | 4 +- .../tests/regressions/RD5921Test.scala | 6 +- .../tests/regressions/RD5925Test.scala | 4 +- .../tests/regressions/RD5932Test.scala | 6 +- .../tests/regressions/RD5968Test.scala | 6 +- .../tests/regressions/RD5971Test.scala | 4 +- .../tests/regressions/RD5979Test.scala | 4 +- .../tests/regressions/RD7924Test.scala | 6 +- .../tests/regressions/RD7974Test.scala | 4 +- .../tests/regressions/RD8530Test.scala | 4 +- .../tests/regressions/RD8764Test.scala | 4 +- .../tests/regressions/RD8935Test.scala | 6 +- .../tests/regressions/RD8993Test.scala | 4 +- .../tests/regressions/RD9137Test.scala | 4 +- .../tests/regressions/RD9228Test.scala | 4 +- .../tests/regressions/RD9229Test.scala | 4 +- .../tests/regressions/RD9255Test.scala | 4 +- .../tests/regressions/RD9359Test.scala | 6 +- .../tests/regressions/RD9409Test.scala | 4 +- .../tests/regressions/RD9445Test.scala | 4 +- .../tests/regressions/RD9479Test.scala | 6 +- .../tests/regressions/RD9485Test.scala | 4 +- .../tests/regressions/RD9554Test.scala | 4 +- .../tests/regressions/RD9616Test.scala | 4 +- .../tests/regressions/RD9932Test.scala | 4 +- .../regressions/credentials/RD3084Test.scala | 4 +- .../regressions/credentials/RD4445Test.scala | 4 +- .../regressions/credentials/RD5932Test.scala | 4 +- .../tests/spec/BasicStagedCompilerTest.scala | 4 +- .../tests/spec/BinaryExpAndTest.scala | 4 +- .../tests/spec/BinaryExpDivTest.scala | 4 +- .../compiler/tests/spec/BinaryExpEqTest.scala | 4 +- .../compiler/tests/spec/BinaryExpGeTest.scala | 4 +- .../compiler/tests/spec/BinaryExpGtTest.scala | 4 +- .../compiler/tests/spec/BinaryExpLeTest.scala | 4 +- .../compiler/tests/spec/BinaryExpLtTest.scala | 4 +- .../tests/spec/BinaryExpModTest.scala | 4 +- .../tests/spec/BinaryExpMultTest.scala | 4 +- .../tests/spec/BinaryExpNeqTest.scala | 4 +- .../compiler/tests/spec/BinaryExpOrTest.scala | 4 +- .../tests/spec/BinaryExpPlusTest.scala | 4 +- .../tests/spec/BinaryExpSubTest.scala | 4 +- .../compiler/tests/spec/ClosureTest.scala | 4 +- .../snapi/compiler/tests/spec/ConstTest.scala | 4 +- .../compiler/tests/spec/ErrorsTest.scala | 4 +- .../compiler/tests/spec/FunAbsTest.scala | 4 +- .../compiler/tests/spec/IfThenElseTest.scala | 4 +- .../tests/spec/ImplicitCastTest.scala | 4 +- .../tests/spec/JoinWithTryRowsTest.scala | 6 +- .../compiler/tests/spec/LetBindTest.scala | 4 +- .../compiler/tests/spec/LetFunRecTest.scala | 4 +- .../compiler/tests/spec/LetFunTest.scala | 4 +- .../compiler/tests/spec/LetTypeTest.scala | 4 +- .../compiler/tests/spec/MigrationTest.scala | 4 +- .../compiler/tests/spec/PackageNameTest.scala | 4 +- .../snapi/compiler/tests/spec/ProjTest.scala | 4 +- .../compiler/tests/spec/PropagationTest.scala | 4 +- .../tests/spec/StagedCompilerTest.scala | 6 +- .../compiler/tests/spec/UnaryExpNegTest.scala | 4 +- .../compiler/tests/spec/UnaryExpNotTest.scala | 4 +- snapi-frontend/src/main/java/module-info.java | 14 +- .../{utils => base}/Attribution.scala | 2 +- .../snapi/frontend/base/BaseTree.scala | 1 - .../snapi/frontend/base/CompilerContext.scala | 4 +- .../{utils => base}/ExtraRewriters.scala | 2 +- .../frontend/base/SemanticAnalyzer.scala | 1 - .../rawlabs/snapi/frontend/base/Tree.scala | 2 +- .../frontend/base/source/SourceTree.scala | 18 +- .../frontend/common/source/SourceTree.scala | 166 ---- ...erProperties.scala => InferrerInput.scala} | 49 +- ...Descriptors.scala => InferrerOutput.scala} | 34 +- .../inferrer/api/InferrerService.scala | 16 +- .../api/SourceTypePrettyPrinter.scala | 58 -- .../frontend/inferrer/api/SourceTypes.scala | 17 +- .../inferrer/local/LocalInferrerService.scala | 245 +++-- .../frontend/inferrer/local/MergeTypes.scala | 4 +- .../inferrer/local/auto/AutoInferrer.scala | 16 +- .../inferrer/local/csv/CsvInferrer.scala | 8 +- .../inferrer/local/hjson/HjsonInferrer.scala | 8 +- .../inferrer/local/json/JsonInferrer.scala | 8 +- .../inferrer/local/text/TextInferrer.scala | 10 +- .../local/xml/InferrerXmlTypeReader.scala | 6 +- .../inferrer/local/xml/XmlInferrer.scala | 8 +- .../inferrer/local/xml/XmlMergeTypes.scala | 2 +- .../rql2/CommonSemanticAnalyzer.scala | 21 +- .../rql2/FrontendSyntaxAnalyzer.scala | 4 +- ...ilerLspService.scala => LspAnalyzer.scala} | 15 +- .../{common => rql2}/PhaseDescriptor.scala | 4 +- .../snapi/frontend/rql2/PipelinedPhase.scala | 2 +- .../snapi/frontend/rql2/ProgramContext.scala | 17 +- .../frontend/rql2/Rql2ProgramContext.scala | 21 - .../snapi/frontend/rql2/Rql2TypeUtils.scala | 28 +- .../{api/Values.scala => Rql2Values.scala} | 2 +- .../frontend/rql2/SemanticAnalyzer.scala | 9 +- .../snapi/frontend/rql2/StagedCompiler.scala | 2 +- .../snapi/frontend/rql2/SymbolTable.scala | 10 +- .../snapi/frontend/rql2/SyntaxAnalyzer.scala | 4 +- .../rawlabs/snapi/frontend/rql2/Tree.scala | 2 +- .../frontend/rql2/TreeWithPositions.scala | 2 +- .../rql2/antlr4/Antlr4SyntaxAnalyzer.scala | 18 +- .../antlr4/CommentsAntlrSyntaxAnalyzer.scala | 4 +- ...Listener.scala => Rql2ErrorListener.scala} | 11 +- ...RawPositions.scala => Rql2Positions.scala} | 9 +- ...piVisitor.scala => Rql2SnapiVisitor.scala} | 10 +- ...ors.scala => Rql2VisitorParseErrors.scala} | 13 +- .../rql2/api/EntryExtensionProvider.scala | 302 ------ .../rql2/api/PackageExtensionProvider.scala | 70 -- .../rql2/builtin/BinaryPackageBuilder.scala | 26 - .../rql2/builtin/BytePackageBuilder.scala | 25 - .../builtin/CollectionPackageBuilder.scala | 135 --- .../rql2/builtin/DatePackageBuilder.scala | 40 - .../rql2/builtin/DecimalPackageBuilder.scala | 25 - .../rql2/builtin/DoublePackageBuilder.scala | 25 - .../builtin/EnvironmentPackageBuilder.scala | 30 - .../rql2/builtin/ErrorPackageBuilder.scala | 33 - .../rql2/builtin/FloatPackageBuilder.scala | 26 - .../rql2/builtin/IntPackageBuilder.scala | 25 - .../rql2/builtin/IntervalPackageBuilder.scala | 45 - .../rql2/builtin/ListPackageBuilder.scala | 72 -- .../rql2/builtin/LocationPackageBuilder.scala | 29 - .../rql2/builtin/LongPackageBuilder.scala | 25 - .../rql2/builtin/NullablePackageBuilder.scala | 44 - .../NullableTryablePackageBuilder.scala | 25 - .../rql2/builtin/RecordPackageBuilder.scala | 50 - .../rql2/builtin/ShortPackageBuilder.scala | 25 - .../rql2/builtin/SuccessPackageBuilder.scala | 25 - .../rql2/builtin/TimePackageBuilder.scala | 48 - .../builtin/TimestampPackageBuilder.scala | 45 - .../rql2/builtin/TryPackageBuilder.scala | 37 - .../rql2/builtin/TypePackageBuilder.scala | 34 - .../extensions/EntryExtensionProvider.scala | 304 ++++++ .../LocationDescription.scala | 2 +- .../PackageExtension.scala | 6 +- .../extensions/PackageExtensionProvider.scala | 71 ++ .../builtin/Aggregations.scala | 6 +- .../{ => extensions}/builtin/AwsPackage.scala | 4 +- .../builtin/BinaryPackage.scala | 14 +- .../builtin/BytePackage.scala | 13 +- .../builtin/CollectionPackage.scala | 125 ++- .../{ => extensions}/builtin/CsvPackage.scala | 28 +- .../builtin/DatePackage.scala | 28 +- .../builtin/DecimalPackage.scala | 20 +- .../builtin/DoublePackage.scala | 13 +- .../builtin/EnvironmentPackage.scala | 17 +- .../builtin/ErrorPackage.scala | 28 +- .../builtin/FloatPackage.scala | 14 +- .../builtin/FunctionPackage.scala | 4 +- .../builtin/HttpPackage.scala | 11 +- .../{ => extensions}/builtin/IntPackage.scala | 13 +- .../builtin/IntervalPackage.scala | 40 +- .../builtin/JsonPackage.scala | 32 +- .../builtin/KryoPackage.scala | 4 +- .../builtin/LibraryPackage.scala | 16 +- .../builtin/ListPackage.scala | 62 +- .../builtin/LocationPackage.scala | 17 +- .../builtin/LongPackage.scala | 13 +- .../builtin/MathPackage.scala | 13 +- .../builtin/MySQLPackage.scala | 28 +- .../builtin/NullablePackage.scala | 31 +- .../builtin/NullableTryablePackage.scala | 13 +- .../builtin/OraclePackage.scala | 30 +- .../builtin/PostgreSQLPackage.scala | 27 +- .../builtin/RecordPackage.scala | 48 +- .../builtin/RegexPackage.scala | 4 +- .../{ => extensions}/builtin/S3Package.scala | 4 +- .../builtin/SQLServerPackage.scala | 27 +- .../builtin/ShortPackage.scala | 13 +- .../builtin/SnowflakePackage.scala | 31 +- .../builtin/StringPackage.scala | 13 +- .../builtin/SuccessPackage.scala | 23 +- .../builtin/TestPackage.scala | 6 +- .../builtin/TimePackage.scala | 35 +- .../builtin/TimestampPackage.scala | 41 +- .../{ => extensions}/builtin/TryPackage.scala | 25 +- .../builtin/TypePackage.scala | 31 +- .../{ => extensions}/builtin/XmlPackage.scala | 18 +- .../frontend/rql2/lsp/LspSyntaxAnalyzer.scala | 106 --- .../frontend/{utils => rql2}/package.scala | 2 +- .../ImplicitCastsPhase.scala} | 12 +- .../ListProjDesugarerPhase.scala} | 13 +- .../PropagationPhase.scala} | 39 +- .../SugarExtensionDesugarerPhase.scala} | 15 +- .../source/SourceCommentsPrettyPrinter.scala | 2 +- .../rql2/source/SourcePrettyPrinter.scala | 5 +- .../frontend/rql2/source/SourceTree.scala | 136 ++- .../inferrer/local/LocalInferrerTest.scala | 132 +-- .../{RD10260.scala => RD10260Test.scala} | 5 +- .../{RD10439.scala => RD10439Test.scala} | 2 +- .../local/{RD3852.scala => RD3852Test.scala} | 12 +- .../inferrer/local/TextTypeInferrerTest.scala | 2 +- ...lr4LSPTests.scala => Antlr4LspTests.scala} | 4 +- .../FrontendSyntaxAnalyzerCompareTest.scala | 2 +- .../rql2/OldFrontendSyntaxAnalyzerTest.scala | 2 +- .../rql2/SyntaxAnalyzerCompareTest.scala | 2 +- .../snapi/parser/generated/Placeholder.java | 10 +- .../RawContext.java => Rql2Context.java} | 34 +- .../RawLanguage.java => Rql2Language.java} | 64 +- ...guageCache.java => Rql2LanguageCache.java} | 12 +- .../RawOptions.java => Rql2Options.java} | 6 +- .../{runtime/RawTypes.java => Rql2Types.java} | 10 +- .../truffle/{runtime => }/ast/BinaryNode.java | 3 +- .../{runtime => ast}/ExpressionNode.java | 46 +- .../ast/ProgramExpressionNode.java | 10 +- .../ast/ProgramStatementNode.java | 7 +- .../{runtime => ast}/PropertyType.java | 2 +- .../{runtime => ast}/StatementNode.java | 2 +- .../TruffleBoundaries.java} | 4 +- .../truffle/{runtime => }/ast/TypeGuards.java | 2 +- .../ast/controlflow/ExpBlockNode.java | 6 +- .../ast/controlflow/IfThenElseNode.java | 8 +- .../aggregation/AggregateMultipleNode.java | 24 +- .../aggregation/AggregateSingleNode.java | 24 +- .../expressions/aggregation/Aggregations.java | 2 +- .../aggregation/AggregatorNodes.java | 8 +- .../ast/expressions/binary/AndNode.java | 10 +- .../ast/expressions/binary/DivNode.java | 8 +- .../ast/expressions/binary/EqNode.java | 10 +- .../ast/expressions/binary/GeNode.java | 10 +- .../ast/expressions/binary/GtNode.java | 10 +- .../ast/expressions/binary/LeNode.java | 10 +- .../ast/expressions/binary/LtNode.java | 10 +- .../ast/expressions/binary/ModNode.java | 6 +- .../ast/expressions/binary/MultNode.java | 6 +- .../ast/expressions/binary/OrNode.java | 10 +- .../ast/expressions/binary/PlusNode.java | 10 +- .../ast/expressions/binary/SubNode.java | 6 +- .../aws_package/AwsV4SignedRequestNode.java | 30 +- .../binary_package/BinaryBase64Node.java | 6 +- .../binary_package/BinaryFromStringNode.java | 6 +- .../binary_package/BinaryReadNode.java | 16 +- .../EnvironmentParameterNode.java | 38 +- .../EnvironmentScopesNode.java | 8 +- .../EnvironmentSecretNode.java | 16 +- .../FunctionInvokeAfterNode.java | 10 +- .../builtin/http_package/HttpReadNode.java | 26 +- .../http_package/HttpUrlDecodeNode.java | 4 +- .../http_package/HttpUrlEncodeNode.java | 4 +- .../builtin/jdbc/JdbcQueryNode.java | 16 +- .../LocationDescribeNode.java | 78 +- .../LocationFromHttpNode.java | 20 +- .../LocationFromMySQLCredentialNode.java | 14 +- .../LocationFromMySQLNode.java | 10 +- .../LocationFromOracleCredentialNode.java | 14 +- .../LocationFromOracleNode.java | 10 +- .../LocationFromPostgreSQLCredentialNode.java | 14 +- .../LocationFromPostgreSQLNode.java | 10 +- .../location_package/LocationFromS3Node.java | 14 +- .../LocationFromSQLServerCredentialNode.java | 14 +- .../LocationFromSQLServerNode.java | 10 +- .../LocationFromSnowflakeCredentialNode.java | 14 +- .../LocationFromSnowflakeNode.java | 18 +- .../LocationFromStringNode.java | 18 +- .../location_package/LocationLlNode.java | 28 +- .../location_package/LocationLsNode.java | 12 +- .../builtin/math_package/MathAbsNode.java | 4 +- .../builtin/math_package/MathAcosNode.java | 4 +- .../builtin/math_package/MathAsinNode.java | 4 +- .../builtin/math_package/MathAtanNode.java | 4 +- .../builtin/math_package/MathAtn2Node.java | 4 +- .../builtin/math_package/MathCeilingNode.java | 6 +- .../builtin/math_package/MathCosNode.java | 4 +- .../builtin/math_package/MathCotNode.java | 4 +- .../builtin/math_package/MathDegreesNode.java | 4 +- .../builtin/math_package/MathExpNode.java | 4 +- .../builtin/math_package/MathFloorNode.java | 6 +- .../builtin/math_package/MathLog10Node.java | 4 +- .../builtin/math_package/MathLogNode.java | 4 +- .../builtin/math_package/MathPowerNode.java | 4 +- .../builtin/math_package/MathRadiansNode.java | 4 +- .../builtin/math_package/MathSignNode.java | 4 +- .../builtin/math_package/MathSinNode.java | 4 +- .../builtin/math_package/MathSqrtNode.java | 4 +- .../builtin/math_package/MathSquareNode.java | 4 +- .../builtin/math_package/MathTanNode.java | 4 +- .../numeric/byte_package/ByteFromNode.java | 8 +- .../decimal_package/DecimalFromNode.java | 8 +- .../decimal_package/DecimalRoundNode.java | 6 +- .../double_package/DoubleFromNode.java | 8 +- .../numeric/float_package/FloatFromNode.java | 8 +- .../numeric/int_package/IntFromNode.java | 14 +- .../numeric/int_package/IntRangeNode.java | 10 +- .../numeric/long_package/LongFromNode.java | 8 +- .../numeric/long_package/LongRangeNode.java | 10 +- .../numeric/short_package/ShortFromNode.java | 8 +- .../builtin/regex_package/RegexCache.java | 2 +- .../regex_package/RegexFirstMatchInNode.java | 8 +- .../regex_package/RegexGroupsNode.java | 10 +- .../regex_package/RegexMatchesNode.java | 6 +- .../regex_package/RegexReplaceNode.java | 6 +- .../string_package/StringBase64Node.java | 4 +- .../string_package/StringCapitalizeNode.java | 4 +- .../string_package/StringContainsNode.java | 4 +- .../StringCountSubStringNode.java | 4 +- .../string_package/StringDecodeNode.java | 8 +- .../string_package/StringEmptyNode.java | 4 +- .../string_package/StringEncodeNode.java | 8 +- .../string_package/StringFromNode.java | 8 +- .../string_package/StringLTrimNode.java | 4 +- .../string_package/StringLengthNode.java | 4 +- .../StringLevenshteinDistanceNode.java | 4 +- .../string_package/StringLowerNode.java | 4 +- .../string_package/StringRTrimNode.java | 4 +- .../string_package/StringReadLinesNode.java | 10 +- .../string_package/StringReadNode.java | 14 +- .../string_package/StringReplaceNode.java | 4 +- .../string_package/StringReplicateNode.java | 4 +- .../string_package/StringReverseNode.java | 4 +- .../string_package/StringSplitNode.java | 6 +- .../string_package/StringStartsWithNode.java | 4 +- .../string_package/StringSubStringNode.java | 8 +- .../string_package/StringTrimNode.java | 4 +- .../string_package/StringUpperNode.java | 4 +- .../temporals/DateTimeFormatCache.java | 2 +- .../date_package/DateAddIntervalNode.java | 10 +- .../temporals/date_package/DateBuildNode.java | 8 +- .../temporals/date_package/DateDayNode.java | 6 +- .../date_package/DateFromEpochDayNode.java | 6 +- .../date_package/DateFromTimestampNode.java | 8 +- .../temporals/date_package/DateMonthNode.java | 6 +- .../temporals/date_package/DateNowNode.java | 6 +- .../temporals/date_package/DateParseNode.java | 10 +- .../DateSubtractIntervalNode.java | 10 +- .../date_package/DateSubtractNode.java | 10 +- .../temporals/date_package/DateYearNode.java | 6 +- .../interval_package/IntervalBuildNode.java | 6 +- .../interval_package/IntervalDaysNode.java | 6 +- .../IntervalFromMillisNode.java | 6 +- .../interval_package/IntervalHoursNode.java | 6 +- .../interval_package/IntervalMillisNode.java | 6 +- .../interval_package/IntervalMinutesNode.java | 6 +- .../interval_package/IntervalMonthsNode.java | 6 +- .../interval_package/IntervalNodes.java | 32 +- .../interval_package/IntervalParseNode.java | 14 +- .../interval_package/IntervalSecondsNode.java | 6 +- .../IntervalToMillisNode.java | 6 +- .../interval_package/IntervalWeeksNode.java | 6 +- .../interval_package/IntervalYearsNode.java | 6 +- .../time_package/TimeAddIntervalNode.java | 8 +- .../temporals/time_package/TimeBuildNode.java | 8 +- .../temporals/time_package/TimeHourNode.java | 6 +- .../time_package/TimeMillisNode.java | 6 +- .../time_package/TimeMinuteNode.java | 6 +- .../temporals/time_package/TimeNowNode.java | 6 +- .../temporals/time_package/TimeParseNode.java | 10 +- .../time_package/TimeSecondNode.java | 6 +- .../TimeSubtractIntervalNode.java | 8 +- .../time_package/TimeSubtractNode.java | 10 +- .../TimestampAddIntervalNode.java | 8 +- .../timestamp_package/TimestampBuildNode.java | 8 +- .../timestamp_package/TimestampDayNode.java | 6 +- .../TimestampFromDateNode.java | 8 +- .../TimestampFromUnixTimestampNode.java | 6 +- .../timestamp_package/TimestampHourNode.java | 6 +- .../TimestampMillisNode.java | 6 +- .../TimestampMinuteNode.java | 6 +- .../timestamp_package/TimestampMonthNode.java | 6 +- .../timestamp_package/TimestampNowNode.java | 6 +- .../timestamp_package/TimestampParseNode.java | 10 +- .../timestamp_package/TimestampRangeNode.java | 16 +- .../TimestampSecondNode.java | 6 +- .../TimestampSubtractIntervalNode.java | 8 +- .../TimestampSubtractNode.java | 10 +- .../TimestampTimeBucketIntervalNode.java | 16 +- .../TimestampTimeBucketStringNode.java | 10 +- .../TimestampToUnixTimestampNode.java | 6 +- .../timestamp_package/TimestampYearNode.java | 6 +- .../builtin/type_package/TypeMatchNode.java | 10 +- .../TypeProtectCastOptionNode.java | 10 +- .../TypeProtectCastTryableNode.java | 10 +- .../ast/expressions/function/ClosureNode.java | 8 +- .../ast/expressions/function/InvokeNode.java | 4 +- .../ast/expressions/function/InvokeNodes.java | 6 +- .../ast/expressions/function/MethodNode.java | 16 +- .../expressions/function/RecClosureNode.java | 8 +- .../iterable/ArrayOperationNodes.java | 14 +- .../collection/CollectionBuildNode.java | 6 +- .../collection/CollectionDistinctNode.java | 6 +- .../collection/CollectionEquiJoinNode.java | 6 +- .../collection/CollectionExistsNode.java | 24 +- .../collection/CollectionFilterNode.java | 6 +- .../collection/CollectionFirstNode.java | 16 +- .../collection/CollectionFromNode.java | 6 +- .../collection/CollectionGroupByNode.java | 6 +- .../collection/CollectionJoinNode.java | 8 +- .../collection/CollectionMkStringNode.java | 28 +- .../collection/CollectionOrderByNode.java | 12 +- .../collection/CollectionTakeNode.java | 6 +- .../collection/CollectionTransformNode.java | 6 +- .../collection/CollectionTupleAvgNode.java | 16 +- .../collection/CollectionUnionNode.java | 6 +- .../collection/CollectionUnnestNode.java | 6 +- .../collection/CollectionZipNode.java | 10 +- .../iterable/list/ListBuildNode.java | 10 +- .../iterable/list/ListCountNode.java | 6 +- .../iterable/list/ListExistsNode.java | 22 +- .../iterable/list/ListFilterNode.java | 28 +- .../iterable/list/ListFirstNode.java | 10 +- .../iterable/list/ListFromNode.java | 35 +- .../iterable/list/ListFromUnsafe.java | 27 +- .../iterable/list/ListGetNode.java | 8 +- .../iterable/list/ListGroupByNode.java | 38 +- .../iterable/list/ListLastNode.java | 10 +- .../iterable/list/ListTakeNode.java | 8 +- .../iterable/list/ListTransformNode.java | 17 +- .../expressions/literals/BinaryConstNode.java | 6 +- .../ast/expressions/literals/BoolNode.java | 4 +- .../ast/expressions/literals/ByteNode.java | 4 +- .../ast/expressions/literals/DecimalNode.java | 6 +- .../ast/expressions/literals/DoubleNode.java | 4 +- .../ast/expressions/literals/FloatNode.java | 4 +- .../ast/expressions/literals/IntNode.java | 4 +- .../literals/LocationConstNode.java | 12 +- .../ast/expressions/literals/LongNode.java | 4 +- .../ast/expressions/literals/ShortNode.java | 4 +- .../ast/expressions/literals/StringNode.java | 4 +- .../expressions/literals/UndefinedNode.java | 8 +- .../ast/expressions/literals/UnitNode.java | 4 +- .../expressions/literals/ZeroedConstNode.java | 4 +- .../expressions/option/OptionFlatMapNode.java | 10 +- .../option/OptionGetOrElseNode.java | 8 +- .../option/OptionIsDefinedNode.java | 6 +- .../ast/expressions/option/OptionMapNode.java | 10 +- .../expressions/option/OptionNoneNode.java | 6 +- .../expressions/option/OptionSomeNode.java | 4 +- .../option/OptionUnsafeGetNode.java | 12 +- .../record/RecordAddFieldNode.java | 10 +- .../expressions/record/RecordBuildNode.java | 12 +- .../expressions/record/RecordConcatNode.java | 10 +- .../expressions/record/RecordFieldsNode.java | 8 +- .../expressions/record/RecordProjNode.java | 6 +- .../record/RecordRemoveFieldNode.java | 10 +- .../record/RecordStaticInitializers.java | 12 +- .../tryable/TryableFailureNode.java | 6 +- .../tryable/TryableFailureWithTypeNode.java | 6 +- .../tryable/TryableFlatMapNode.java | 10 +- .../tryable/TryableGetFailureNode.java | 6 +- .../tryable/TryableIsFailureNode.java | 6 +- .../tryable/TryableIsSuccessNode.java | 6 +- .../expressions/tryable/TryableMapNode.java | 10 +- .../tryable/TryableNullableFlatMapNode.java | 14 +- .../tryable/TryableSuccessNode.java | 4 +- .../tryable/TryableUnsafeGetNode.java | 14 +- .../ast/expressions/unary/NegNode.java | 6 +- .../ast/expressions/unary/NotNode.java | 4 +- .../ast/expressions/unary/NotNullNode.java | 4 +- .../ast/io/binary/BinaryBytesWriterNode.java | 10 +- .../ast/io/binary/BinaryWriterNode.java | 12 +- .../io/binary/NullableBinaryWriterNode.java | 10 +- .../io/binary/TryableBinaryWriterNode.java | 14 +- .../ast/io/csv/reader/CsvParserNodes.java | 22 +- .../csv/reader/parser/BoolParseCsvNode.java | 6 +- .../csv/reader/parser/DateParseCsvNode.java | 8 +- .../reader/parser/DecimalParseCsvNode.java | 6 +- .../csv/reader/parser/DoubleParseCsvNode.java | 6 +- .../io/csv/reader/parser/IntParseCsvNode.java | 6 +- .../reader/parser/IterableParseCsvFile.java | 24 +- .../reader/parser/IterableParseCsvString.java | 22 +- .../csv/reader/parser/LongParseCsvNode.java | 6 +- .../reader/parser/OptionBoolParseCsvNode.java | 6 +- .../reader/parser/OptionByteParseCsvNode.java | 6 +- .../reader/parser/OptionDateParseCsvNode.java | 6 +- .../parser/OptionDecimalParseCsvNode.java | 6 +- .../parser/OptionDoubleParseCsvNode.java | 6 +- .../parser/OptionFloatParseCsvNode.java | 6 +- .../reader/parser/OptionIntParseCsvNode.java | 6 +- .../reader/parser/OptionLongParseCsvNode.java | 6 +- .../parser/OptionShortParseCsvNode.java | 6 +- .../parser/OptionStringParseCsvNode.java | 6 +- .../reader/parser/OptionTimeParseCsvNode.java | 6 +- .../parser/OptionTimestampParseCsvNode.java | 6 +- .../parser/OptionUndefinedParseCsvNode.java | 6 +- .../csv/reader/parser/RecordParseCsvNode.java | 16 +- .../csv/reader/parser/ShortParseCsvNode.java | 6 +- .../csv/reader/parser/StringParseCsvNode.java | 6 +- .../csv/reader/parser/TimeParseCsvNode.java | 8 +- .../reader/parser/TimestampParseCsvNode.java | 8 +- .../csv/reader/parser/TruffleCsvParser.java} | 130 +-- .../parser/TruffleCsvParserSettings.java} | 6 +- .../reader/parser/TryableParseCsvNode.java | 14 +- .../reader/parser/UndefinedParseCsvNode.java | 6 +- .../io/csv/writer/CsvIterableWriterNode.java | 24 +- .../ast/io/csv/writer/CsvListWriterNode.java | 22 +- .../writer/internal/BinaryWriteCsvNode.java | 10 +- .../csv/writer/internal/BoolWriteCsvNode.java | 8 +- .../csv/writer/internal/ByteWriteCsvNode.java | 8 +- .../csv/writer/internal/DateWriteCsvNode.java | 10 +- .../writer/internal/DecimalWriteCsvNode.java | 10 +- .../writer/internal/DoubleWriteCsvNode.java | 8 +- .../writer/internal/FloatWriteCsvNode.java | 8 +- .../csv/writer/internal/IntWriteCsvNode.java | 8 +- .../csv/writer/internal/LongWriteCsvNode.java | 8 +- .../writer/internal/NullableWriteCsvNode.java | 14 +- .../writer/internal/RecordWriteCsvNode.java | 20 +- .../writer/internal/ShortWriteCsvNode.java | 8 +- .../writer/internal/StringWriteCsvNode.java | 8 +- .../csv/writer/internal/TimeWriteCsvNode.java | 10 +- .../internal/TimestampWriteCsvNode.java | 10 +- .../writer/internal/TryableWriteCsvNode.java | 14 +- .../ast/io/jdbc/BinaryReadJdbcQuery.java | 6 +- .../ast/io/jdbc/BoolReadJdbcQuery.java | 4 +- .../ast/io/jdbc/ByteReadJdbcQuery.java | 4 +- .../ast/io/jdbc/DateReadJdbcQuery.java | 6 +- .../ast/io/jdbc/DecimalReadJdbcQuery.java | 6 +- .../ast/io/jdbc/DoubleReadJdbcQuery.java | 4 +- .../ast/io/jdbc/FloatReadJdbcQuery.java | 4 +- .../ast/io/jdbc/IntReadJdbcQuery.java | 4 +- .../{runtime => }/ast/io/jdbc/JdbcQuery.java | 10 +- .../ast/io/jdbc/LongReadJdbcQuery.java | 4 +- .../ast/io/jdbc/NullableReadJdbcQuery.java | 8 +- .../ast/io/jdbc/RecordReadJdbcQuery.java | 14 +- .../ast/io/jdbc/ShortReadJdbcQuery.java | 4 +- .../ast/io/jdbc/StringReadJdbcQuery.java | 4 +- .../ast/io/jdbc/TimeReadJdbcQuery.java | 6 +- .../ast/io/jdbc/TimestampReadJdbcQuery.java | 6 +- .../ast/io/jdbc/TryableReadJdbcQuery.java | 12 +- .../ast/io/json/reader/JsonParseNode.java | 14 +- .../ast/io/json/reader/JsonParserNodes.java | 91 +- .../ast/io/json/reader/JsonPrintNode.java | 10 +- .../json/reader/JsonReadCollectionNode.java | 10 +- .../ast/io/json/reader/JsonReadValueNode.java | 12 +- .../json/reader/TryableTopLevelWrapper.java | 10 +- .../json/reader/parser/AnyParseJsonNode.java | 6 +- .../reader/parser/BinaryParseJsonNode.java | 8 +- .../reader/parser/BooleanParseJsonNode.java | 6 +- .../json/reader/parser/ByteParseJsonNode.java | 6 +- .../reader/parser/CheckNonNullJsonNode.java | 10 +- .../json/reader/parser/DateParseJsonNode.java | 8 +- .../reader/parser/DecimalParseJsonNode.java | 8 +- .../reader/parser/DoubleParseJsonNode.java | 6 +- .../reader/parser/FloatParseJsonNode.java | 6 +- .../json/reader/parser/IntParseJsonNode.java | 6 +- .../reader/parser/IntervalParseJsonNode.java | 8 +- .../reader/parser/IterableParseJsonNode.java | 10 +- .../json/reader/parser/ListParseJsonNode.java | 25 +- .../json/reader/parser/LongParseJsonNode.java | 6 +- .../reader/parser/NullableParseJsonNode.java | 18 +- .../json/reader/parser/OrParseJsonNode.java | 22 +- .../reader/parser/RecordParseJsonNode.java | 30 +- .../reader/parser/ShortParseJsonNode.java | 6 +- .../reader/parser/StringParseJsonNode.java | 6 +- .../json/reader/parser/TimeParseJsonNode.java | 8 +- .../reader/parser/TimestampParseJsonNode.java | 8 +- .../reader/parser/TryableParseJsonNode.java | 20 +- .../reader/parser/UndefinedParseJsonNode.java | 6 +- .../ast/io/json/writer/JsonWriteNodes.java | 58 +- .../ast/io/json/writer/JsonWriterNode.java | 12 +- .../writer/internal/AnyWriteJsonNode.java | 8 +- .../writer/internal/BinaryWriteJsonNode.java | 10 +- .../writer/internal/BooleanWriteJsonNode.java | 8 +- .../writer/internal/ByteWriteJsonNode.java | 8 +- .../writer/internal/DateWriteJsonNode.java | 10 +- .../writer/internal/DecimalWriteJsonNode.java | 10 +- .../writer/internal/DoubleWriteJsonNode.java | 8 +- .../writer/internal/FloatWriteJsonNode.java | 8 +- .../writer/internal/IntWriteJsonNode.java | 8 +- .../internal/IntervalWriteJsonNode.java | 10 +- .../internal/IterableWriteJsonNode.java | 18 +- .../writer/internal/ListWriteJsonNode.java | 14 +- .../writer/internal/LongWriteJsonNode.java | 8 +- .../internal/NullableWriteJsonNode.java | 14 +- .../json/writer/internal/OrWriteJsonNode.java | 8 +- .../writer/internal/RecordWriteJsonNode.java | 18 +- .../writer/internal/ShortWriteJsonNode.java | 8 +- .../writer/internal/StringWriteJsonNode.java | 8 +- .../writer/internal/TimeWriteJsonNode.java | 10 +- .../internal/TimestampWriteJsonNode.java | 10 +- .../internal/TryableUnsafeWriteJsonNode.java | 14 +- .../writer/internal/TryableWriteJsonNode.java | 14 +- .../internal/UndefinedWriteJsonNode.java | 4 +- .../ast/io/kryo/KryoFromNode.java | 8 +- .../ast/io/kryo/KryoWriteNode.java | 8 +- .../AttributeParsePrimitiveXmlNode.java | 8 +- .../ast/io/xml/parser/BoolParseXmlNode.java | 6 +- .../ast/io/xml/parser/ByteParseXmlNode.java | 6 +- .../ast/io/xml/parser/DateParseXmlNode.java | 8 +- .../io/xml/parser/DecimalParseXmlNode.java | 8 +- .../ast/io/xml/parser/DoubleParseXmlNode.java | 6 +- .../parser/ElementParseXmlPrimitiveNode.java | 8 +- .../ast/io/xml/parser/FloatParseXmlNode.java | 6 +- .../ast/io/xml/parser/IntParseXmlNode.java | 6 +- .../io/xml/parser/IterableParseXmlNode.java | 12 +- .../ast/io/xml/parser/LongParseXmlNode.java | 6 +- .../io/xml/parser/NullableParseXmlNode.java | 18 +- .../io/xml/parser/OptionParseXmlTextNode.java | 10 +- .../ast/io/xml/parser/OrTypeParseXml.java | 18 +- .../ast/io/xml/parser/RecordParseXmlNode.java | 32 +- .../ast/io/xml/parser/ShortParseXmlNode.java | 6 +- .../ast/io/xml/parser/StringParseXmlNode.java | 4 +- .../xml/parser/TextParseXmlPrimitiveNode.java | 8 +- .../ast/io/xml/parser/TimeParseXmlNode.java | 8 +- .../io/xml/parser/TimestampParseXmlNode.java | 8 +- .../io/xml/parser/TruffleXmlParser.java} | 94 +- .../xml/parser/TruffleXmlParserFactory.java} | 12 +- .../xml/parser/TruffleXmlParserSettings.java} | 6 +- .../parser/TryableParseAttributeXmlNode.java | 12 +- .../io/xml/parser/TryableParseXmlNode.java | 16 +- .../io/xml/parser/UndefinedParseXmlNode.java | 8 +- .../io/xml/parser/XmlParseCollectionNode.java | 12 +- .../ast/io/xml/parser/XmlParseValueNode.java | 16 +- .../io/xml/parser/XmlReadCollectionNode.java | 14 +- .../ast/io/xml/parser/XmlReadValueNode.java | 22 +- .../ast/local/ReadClosureVariableNode.java | 12 +- .../ast/local/ReadLocalVariableNode.java | 6 +- .../ast/local/ReadParamClosureNode.java | 4 +- .../ast/local/ReadParamNode.java | 4 +- .../ast/local/WriteLocalVariableNode.java | 6 +- .../ast/osr/OSRGeneratorNode.java | 8 +- .../OSRCollectionEquiJoinInitBodyNode.java | 16 +- .../bodies/OSRCollectionFilterBodyNode.java | 16 +- .../bodies/OSRCollectionJoinInitBodyNode.java | 14 +- .../bodies/OSRCollectionMkStringBodyNode.java | 12 +- .../bodies/OSRDistinctGetGeneratorNode.java | 14 +- .../osr/bodies/OSREquiJoinNextBodyNode.java | 16 +- .../ast/osr/bodies/OSRExistsBodyNode.java | 16 +- .../ast/osr/bodies/OSRJoinNextBodyNode.java | 28 +- .../bodies/OSRListEquiJoinInitBodyNode.java | 16 +- .../ast/osr/bodies/OSRListFilterBodyNode.java | 16 +- .../ast/osr/bodies/OSRListFromBodyNode.java | 8 +- .../osr/bodies/OSRListParseJsonBodyNode.java | 4 +- .../osr/bodies/OSRListTransformBodyNode.java | 16 +- .../bodies/OSRMultiAggregationBodyNode.java | 12 +- .../bodies/OSROrderByGetGeneratorNode.java | 20 +- .../bodies/OSRSingleAggregationBodyNode.java | 12 +- .../ast/osr/bodies/OSRToArrayBodyNode.java | 6 +- .../OSRCollectionFilterConditionNode.java | 8 +- .../conditions/OSRExistsConditionNode.java | 8 +- .../conditions/OSRFromBodyConditionNode.java | 4 +- .../conditions/OSRHasNextConditionNode.java | 8 +- .../OSRIsLessThanSizeConditionNode.java | 4 +- .../OSRListParseJsonConditionNode.java | 8 +- .../tryable_nullable/Nullable.java | 4 +- .../tryable_nullable/Tryable.java | 4 +- .../TryableNullableNodes.java | 10 +- .../emitter/{compiler => }/SlotLocation.java | 2 +- .../{compiler => }/SnapiTruffleEmitter.java | 80 +- .../snapi/truffle/emitter/TruffleArg.java | 2 +- .../{compiler => }/TruffleBuildBody.java | 4 +- .../emitter/{compiler => }/TruffleEmit.java | 18 +- .../snapi/truffle/emitter/TruffleEmitter.java | 13 +- .../emitter/TruffleEntryExtension.java | 8 +- .../{compiler => }/TruffleEntrypoint.java | 2 +- .../emitter/TruffleShortEntryExtension.java | 6 +- .../truffle/emitter/builtin/WithArgs.java | 2 +- .../TruffleAwsV4SignedRequestEntry.java | 16 +- .../TruffleBinaryBase64Entry.java | 8 +- .../TruffleBinaryReadEntry.java | 8 +- .../TruffleFromStringBinaryEntry.java | 8 +- .../byte_extension/TruffleByteFromEntry.java | 10 +- .../TruffleBuildCollectionEntry.java | 10 +- .../TruffleCountCollectionEntry.java | 10 +- .../TruffleDistinctCollectionEntry.java | 8 +- .../TruffleEmptyCollectionEntry.java | 10 +- .../TruffleExistsCollectionEntry.java | 8 +- .../TruffleFilterCollectionEntry.java | 8 +- .../TruffleFirstCollectionEntry.java | 10 +- .../TruffleFromCollectionEntry.java | 10 +- .../TruffleGroupCollectionEntry.java | 8 +- ...ruffleInternalEquiJoinCollectionEntry.java | 8 +- .../TruffleInternalJoinCollectionEntry.java | 8 +- .../TruffleLastCollectionEntry.java | 10 +- .../TruffleMaxCollectionEntry.java | 10 +- .../TruffleMinCollectionEntry.java | 10 +- .../TruffleMkStringCollectionEntry.java | 10 +- .../TruffleOrderByCollectionEntry.java | 8 +- .../TruffleSumCollectionEntry.java | 10 +- .../TruffleTakeCollectionEntry.java | 10 +- .../TruffleTransformCollectionEntry.java | 10 +- .../TruffleTupleAvgCollectionEntry.java | 8 +- .../TruffleUnionCollectionEntry.java | 10 +- .../TruffleUnnestCollectionEntry.java | 10 +- .../TruffleZipCollectionEntry.java | 10 +- .../builtin/csv_extension/CsvParser.java | 34 +- .../csv_extension/TruffleCsvParseEntry.java | 8 +- .../csv_extension/TruffleCsvReadEntry.java | 8 +- .../TruffleDateAddIntervalEntry.java | 8 +- .../date_extension/TruffleDateBuildEntry.java | 8 +- .../date_extension/TruffleDateDayEntry.java | 8 +- .../TruffleDateFromEpochDayEntry.java | 8 +- .../TruffleDateFromTimestampEntry.java | 8 +- .../date_extension/TruffleDateMonthEntry.java | 8 +- .../date_extension/TruffleDateNowEntry.java | 8 +- .../date_extension/TruffleDateParseEntry.java | 8 +- .../TruffleDateSubtractEntry.java | 8 +- .../TruffleDateSubtractIntervalEntry.java | 8 +- .../date_extension/TruffleDateYearEntry.java | 8 +- .../TruffleDecimalFromEntry.java | 10 +- .../TruffleDecimalRoundEntry.java | 8 +- .../TruffleDoubleFromEntry.java | 10 +- .../TruffleEnvironmentParameterEntry.java | 10 +- .../TruffleEnvironmentScopesEntry.java | 8 +- .../TruffleEnvironmentSecretEntry.java | 8 +- .../TruffleErrorBuildEntry.java | 10 +- .../TruffleErrorBuildWithTypeEntry.java | 10 +- .../error_extension/TruffleErrorGetEntry.java | 10 +- .../TruffleFloatFromEntry.java | 10 +- .../TruffleFunctionInvokeAfterEntry.java | 10 +- .../http_extension/TruffleHttpCallEntry.java | 10 +- .../http_extension/TruffleHttpReadEntry.java | 8 +- .../http_extension/TruffleHttpUrlDecode.java | 8 +- .../http_extension/TruffleHttpUrlEncode.java | 8 +- .../int_extension/TruffleIntFromEntry.java | 10 +- .../int_extension/TruffleIntRangeEntry.java | 12 +- .../TruffleBuildIntervalEntry.java | 12 +- .../TruffleIntervalDaysEntry.java | 8 +- .../TruffleIntervalFromMillisEntry.java | 8 +- .../TruffleIntervalHoursEntry.java | 8 +- .../TruffleIntervalMillisEntry.java | 8 +- .../TruffleIntervalMinutesEntry.java | 8 +- .../TruffleIntervalMonthsEntry.java | 8 +- .../TruffleIntervalParseEntry.java | 8 +- .../TruffleIntervalSecondsEntry.java | 8 +- .../TruffleIntervalToMillisEntry.java | 8 +- .../TruffleIntervalWeeksEntry.java | 8 +- .../TruffleIntervalYearsEntry.java | 8 +- .../truffle/emitter/builtin/jdbc/Jdbc.java | 21 +- .../builtin/json_extension/JsonParser.java | 48 +- .../json_extension/TruffleParseJsonEntry.java | 14 +- .../json_extension/TrufflePrintJsonEntry.java | 12 +- .../json_extension/TruffleReadJsonEntry.java | 14 +- .../builtin/json_extension/WithJsonArgs.java | 4 +- .../TruffleKryoDecodeEntry.java | 10 +- .../TruffleKryoEncodeEntry.java | 10 +- .../list_extension/TruffleBuildListEntry.java | 10 +- .../list_extension/TruffleCountListEntry.java | 10 +- .../list_extension/TruffleEmptyListEntry.java | 10 +- .../TruffleExistsListEntry.java | 8 +- .../TruffleFilterListEntry.java | 8 +- .../list_extension/TruffleFirstListEntry.java | 10 +- .../list_extension/TruffleFromListEntry.java | 8 +- .../list_extension/TruffleGetListEntry.java | 10 +- .../list_extension/TruffleGroupListEntry.java | 8 +- .../list_extension/TruffleLastListEntry.java | 10 +- .../list_extension/TruffleMaxListEntry.java | 12 +- .../list_extension/TruffleMinListEntry.java | 12 +- .../list_extension/TruffleSumListEntry.java | 12 +- .../list_extension/TruffleTakeListEntry.java | 10 +- .../TruffleTransformListEntry.java | 8 +- .../TruffleUnsafeFromListEntry.java | 8 +- .../TruffleLocationDescribeEntry.java | 12 +- .../TruffleLocationFromStringEntry.java | 10 +- .../TruffleLocationLlEntry.java | 10 +- .../TruffleLocationLsEntry.java | 10 +- .../long_extension/TruffleLongFromEntry.java | 10 +- .../long_extension/TruffleLongRangeEntry.java | 12 +- .../math_extension/TruffleMathAbsEntry.java | 10 +- .../math_extension/TruffleMathAcosEntry.java | 8 +- .../math_extension/TruffleMathAsinEntry.java | 8 +- .../math_extension/TruffleMathAtanEntry.java | 8 +- .../math_extension/TruffleMathAtn2Entry.java | 8 +- .../TruffleMathCeilingEntry.java | 8 +- .../math_extension/TruffleMathCosEntry.java | 8 +- .../math_extension/TruffleMathCotEntry.java | 8 +- .../TruffleMathDegreesEntry.java | 8 +- .../math_extension/TruffleMathExpEntry.java | 8 +- .../math_extension/TruffleMathFloorEntry.java | 8 +- .../math_extension/TruffleMathLog10Entry.java | 8 +- .../math_extension/TruffleMathLogEntry.java | 8 +- .../math_extension/TruffleMathPiEntry.java | 8 +- .../math_extension/TruffleMathPowerEntry.java | 8 +- .../TruffleMathRadiansEntry.java | 8 +- .../TruffleMathRandomEntry.java | 8 +- .../math_extension/TruffleMathSignEntry.java | 8 +- .../math_extension/TruffleMathSinEntry.java | 8 +- .../math_extension/TruffleMathSqrtEntry.java | 8 +- .../TruffleMathSquareEntry.java | 8 +- .../math_extension/TruffleMathTanEntry.java | 8 +- .../TruffleMySQLQueryEntry.java | 16 +- .../TruffleNullableBuildEntry.java | 10 +- .../TruffleNullableEmptyEntry.java | 10 +- .../TruffleNullableIsNullEntry.java | 12 +- .../TruffleNullableTransformEntry.java | 10 +- .../TruffleNullableUnsafeGetEntry.java | 10 +- .../TruffleFlatMapNullableTryableEntry.java | 24 +- .../TruffleOracleQueryEntry.java | 16 +- .../TrufflePostgreSQLQueryEntry.java | 16 +- .../TruffleRecordAddFieldEntry.java | 12 +- .../TruffleRecordBuildEntry.java | 10 +- .../TruffleRecordConcatEntry.java | 10 +- .../TruffleRecordFieldsEntry.java | 10 +- .../TruffleRecordGetFieldByIndexEntry.java | 10 +- .../TruffleRecordRemoveFieldEntry.java | 12 +- .../TruffleRegexFirstMatchInEntry.java | 10 +- .../TruffleRegexGroupsEntry.java | 10 +- .../TruffleRegexMatchesEntry.java | 10 +- .../TruffleRegexReplaceEntry.java | 10 +- .../s3_extension/TruffleS3BuildEntry.java | 10 +- .../TruffleShortFromEntry.java | 10 +- .../TruffleSnowflakeQueryEntry.java | 14 +- .../TruffleSQLServerQueryEntry.java | 16 +- .../TruffleBase64EntryExtension.java | 8 +- .../TruffleStringCapitalizeEntry.java | 8 +- .../TruffleStringContainsEntry.java | 8 +- .../TruffleStringCountSubStringEntry.java | 8 +- .../TruffleStringDecodeEntry.java | 8 +- .../TruffleStringEmptyEntry.java | 8 +- .../TruffleStringEncodeEntry.java | 8 +- .../TruffleStringFromEntry.java | 10 +- .../TruffleStringLTrimEntry.java | 8 +- .../TruffleStringLengthEntry.java | 8 +- ...TruffleStringLevenshteinDistanceEntry.java | 8 +- .../TruffleStringLowerEntry.java | 8 +- .../TruffleStringRTrimEntry.java | 8 +- .../TruffleStringReadEntry.java | 12 +- .../TruffleStringReadLinesEntry.java | 12 +- .../TruffleStringReplaceEntry.java | 10 +- .../TruffleStringReplicateEntry.java | 8 +- .../TruffleStringReverseEntry.java | 8 +- .../TruffleStringSplitEntry.java | 8 +- .../TruffleStringStartsWithEntry.java | 8 +- .../TruffleStringSubStringEntry.java | 8 +- .../TruffleStringTrimEntry.java | 8 +- .../TruffleStringUpperEntry.java | 8 +- .../TruffleSuccessBuildEntry.java | 10 +- .../TruffleBoolValueArgTestEntry.java | 2 +- .../TruffleByteValueArgTestEntry.java | 2 +- .../TruffleDateValueArgTestEntry.java | 2 +- .../TruffleDoubleValueArgTestEntry.java | 2 +- .../TruffleFloatValueArgTestEntry.java | 2 +- .../TruffleIntValueArgTestEntry.java | 2 +- .../TruffleIntervalValueArgTestEntry.java | 2 +- .../TruffleListValueArgTestEntry.java | 2 +- .../TruffleLongValueArgTestEntry.java | 2 +- .../test_extension/TruffleMandatoryArgs.java | 8 +- .../TruffleMandatoryExpArgsEntry.java | 2 +- .../TruffleMandatoryValueArgsEntry.java | 2 +- .../test_extension/TruffleOptionalArgs.java | 10 +- .../TruffleOptionalExpArgsTestEntry.java | 2 +- .../TruffleOptionalValueArgsTestEntry.java | 2 +- .../TruffleRecordValueArgTestEntry.java | 2 +- .../TruffleShortValueArgTestEntry.java | 2 +- ...ffleStrictArgsColPassThroughTestEntry.java | 14 +- .../TruffleStrictArgsTestEntry.java | 24 +- .../TruffleStringValueArgTestEntry.java | 2 +- .../TruffleTimeValueArgTestEntry.java | 2 +- .../TruffleTimestampValueArgTestEntry.java | 2 +- .../test_extension/TruffleValueArg.java | 8 +- .../test_extension/TruffleVarArgs.java | 10 +- .../TruffleVarExpArgsTestEntry.java | 2 +- .../TruffleVarNullableStringExpTestEntry.java | 8 +- ...ruffleVarNullableStringValueTestEntry.java | 14 +- .../TruffleVarValueArgsTestEntry.java | 2 +- .../TruffleTimeAddIntervalEntry.java | 8 +- .../time_extension/TruffleTimeBuildEntry.java | 8 +- .../time_extension/TruffleTimeHourEntry.java | 8 +- .../TruffleTimeMillisEntry.java | 8 +- .../TruffleTimeMinuteEntry.java | 8 +- .../time_extension/TruffleTimeNowEntry.java | 8 +- .../time_extension/TruffleTimeParseEntry.java | 8 +- .../TruffleTimeSecondEntry.java | 8 +- .../TruffleTimeSubtractEntry.java | 8 +- .../TruffleTimeSubtractIntervalEntry.java | 8 +- .../TruffleTimestampAddIntervalEntry.java | 8 +- .../TruffleTimestampBuildEntry.java | 8 +- .../TruffleTimestampDayEntry.java | 8 +- .../TruffleTimestampFromDateEntry.java | 8 +- ...ruffleTimestampFromUnixTimestampEntry.java | 8 +- .../TruffleTimestampHourEntry.java | 8 +- .../TruffleTimestampMillisEntry.java | 8 +- .../TruffleTimestampMinuteEntry.java | 8 +- .../TruffleTimestampMonthEntry.java | 8 +- .../TruffleTimestampNowEntry.java | 8 +- .../TruffleTimestampParseEntry.java | 8 +- .../TruffleTimestampRangeEntry.java | 14 +- .../TruffleTimestampSecondEntry.java | 8 +- .../TruffleTimestampSubtractEntry.java | 8 +- ...TruffleTimestampSubtractIntervalEntry.java | 8 +- .../TruffleTimestampTimeBucketEntry.java | 16 +- .../TruffleTimestampToUnixTimestampEntry.java | 8 +- .../TruffleTimestampYearEntry.java | 8 +- .../try_extension/TruffleTryFlatMapEntry.java | 10 +- .../try_extension/TruffleTryIsErrorEntry.java | 10 +- .../TruffleTryIsSuccessEntry.java | 10 +- .../TruffleTryTransformEntry.java | 10 +- .../TruffleTryUnsafeGetEntry.java | 10 +- .../type_extension/TruffleTypeCastEntry.java | 8 +- .../type_extension/TruffleTypeEmptyEntry.java | 10 +- .../type_extension/TruffleTypeMatchEntry.java | 10 +- .../TruffleTypeProtectCastEntry.java | 16 +- .../xml_extension/TruffleParseXmlEntry.java | 18 +- .../xml_extension/TruffleReadXmlEntry.java | 18 +- .../builtin/xml_extension/XmlRecurse.java | 18 +- .../CompilerScalaConsts.java | 2 +- .../{output => writers}/CsvWriter.java | 22 +- .../{output => writers}/JsonWriter.java | 24 +- .../TruffleBinaryWriter.java | 16 +- .../treemap/TreeMapIterator.java | 6 +- .../data_structures/treemap/TreeMapNode.java | 4 +- .../data_structures/treemap/TreeMapNodes.java | 10 +- .../treemap/TreeMapObject.java | 4 +- .../treemap/TreeMapStatic.java | 2 +- .../exceptions/BreakException.java | 2 +- .../ReadLinesTruffleException.java} | 6 +- .../TruffleInternalErrorException.java} | 16 +- .../TruffleRuntimeException.java} | 14 +- .../TruffleUnexpectedNullException.java} | 8 +- .../TruffleValidationException.java} | 10 +- .../binary/BinaryWriterTruffleException.java} | 10 +- .../csv/CsvExpectedNothingException.java | 10 +- .../csv/CsvParserTruffleException.java} | 32 +- .../csv/CsvReaderTruffleException.java} | 30 +- .../csv/CsvWriterTruffleException.java} | 8 +- .../json/JsonExpectedNothingException.java | 4 +- .../exceptions/json/JsonOrTypeException.java | 4 +- .../json/JsonParserTruffleException.java} | 12 +- .../json/JsonReaderTruffleException.java} | 14 +- .../JsonRecordFieldNotFoundException.java | 4 +- .../json/JsonUnexpectedTokenException.java | 4 +- .../json/JsonWriterTruffleException.java} | 10 +- .../rdbms/JdbcExceptionHandler.java | 34 + .../rdbms/JdbcParserTruffleException.java} | 8 +- .../rdbms/JdbcReaderTruffleException.java} | 10 +- .../rdbms/MySQLExceptionHandler.java | 2 +- .../rdbms/OracleExceptionHandler.java | 2 +- .../rdbms/PostgreSQLExceptionHandler.java | 2 +- .../rdbms/SnowflakeExceptionHandler.java | 2 +- .../rdbms/SqlServerExceptionHandler.java | 2 +- .../validation/ValidationErrorMessage.java | 2 +- .../validation/ValidationErrorObject.java | 2 +- .../validation/ValidationErrorPosition.java | 4 +- .../validation/ValidationErrorRange.java | 4 +- .../xml/XmlExpectedNothingException.java | 10 +- .../xml/XmlOrTypeParserException.java | 10 +- .../xml/XmlParserTruffleException.java} | 20 +- .../xml/XmlReaderTruffleException.java} | 26 +- .../{runtime => }/function/Closure.java | 4 +- .../{runtime => }/function/Function.java | 2 +- .../function/FunctionExecuteNodes.java | 2 +- .../FunctionRegistry.java} | 6 +- .../function/FunctionRegistryObject.java | 8 +- .../{runtime => }/function/Lambda.java | 4 +- .../{runtime => }/function/RecClosure.java | 4 +- .../generator/collection/GeneratorNodes.java | 50 +- .../collection/StaticInitializers.java | 38 +- .../abstract_generator/AbstractGenerator.java | 14 +- .../compute_next/ComputeNextNodes.java | 118 ++- .../operations/EquiJoinComputeNext.java | 2 +- .../operations/FilterComputeNext.java | 2 +- .../operations/JoinComputeNext.java | 2 +- .../operations/TakeComputeNext.java | 2 +- .../operations/TransformComputeNext.java | 2 +- .../operations/UnnestComputeNext.java | 2 +- .../operations/ZipComputeNext.java | 2 +- .../sources/CsvReadComputeNext.java | 20 +- .../sources/CsvReadFromStringComputeNext.java | 53 ++ .../sources/EmptyComputeNext.java | 2 +- .../sources/ExpressionComputeNext.java | 10 +- .../sources/IntRangeComputeNext.java | 4 +- .../sources/JdbcQueryComputeNext.java | 8 +- .../sources/JsonReadComputeNext.java | 4 +- .../sources/LongRangeComputeNext.java | 4 +- .../sources/ReadLinesComputeNext.java | 8 +- .../sources/TimestampRangeComputeNext.java | 8 +- .../sources/UnionComputeNext.java | 2 +- .../sources/XmlParseComputeNext.java | 26 +- .../sources/XmlReadComputeNext.java | 20 +- .../input_buffer/GroupByInputBuffer.java | 4 +- .../input_buffer/InputBufferNodes.java | 4 +- .../input_buffer/OrderByInputBuffer.java | 4 +- .../off_heap/OffHeapNodes.java | 30 +- .../distinct/DistinctMemoryGenerator.java | 8 +- .../DistinctSpilledFilesGenerator.java | 6 +- .../off_heap/distinct/OffHeapDistinct.java | 4 +- .../group_by/GroupByMemoryGenerator.java | 8 +- .../GroupBySpilledFilesGenerator.java | 8 +- .../off_heap/group_by/OffHeapGroupByKey.java | 6 +- .../off_heap/order_by/OffHeapGroupByKeys.java | 4 +- .../order_by/OrderByMemoryGenerator.java | 8 +- .../OrderBySpilledFilesGenerator.java | 8 +- .../record_shaper/RecordShaper.java | 2 +- .../record_shaper/RecordShaperNodes.java | 16 +- .../generator/list/ListGenerator.java | 6 +- .../{runtime => }/iterable/IterableNodes.java | 36 +- .../iterable/list/ListIterable.java | 6 +- .../operations/DistinctCollection.java | 6 +- .../operations/EquiJoinCollection.java | 10 +- .../iterable/operations/FilterCollection.java | 6 +- .../operations/GroupByCollection.java | 6 +- .../iterable/operations/JoinCollection.java | 10 +- .../operations/OrderByCollection.java | 6 +- .../iterable/operations/TakeCollection.java | 6 +- .../operations/TransformCollection.java | 6 +- .../iterable/operations/UnnestCollection.java | 6 +- .../iterable/operations/ZipCollection.java | 10 +- .../iterable/sources/CsvCollection.java | 16 +- .../sources/CsvFromStringCollection.java | 14 +- .../iterable/sources/EmptyCollection.java | 8 +- .../sources/ExpressionCollection.java | 8 +- .../iterable/sources/IntRangeCollection.java | 8 +- .../iterable/sources/JdbcQueryCollection.java | 12 +- .../iterable/sources/JsonReadCollection.java | 10 +- .../iterable/sources/LongRangeCollection.java | 8 +- .../iterable/sources/ReadLinesCollection.java | 8 +- .../sources/TimestampRangeCollection.java | 12 +- .../iterable/sources/UnionCollection.java | 8 +- .../iterable/sources/XmlParseCollection.java | 14 +- .../iterable/sources/XmlReadCollection.java | 16 +- .../runtime/{runtime => }/kryo/KryoNodes.java | 29 +- .../{runtime => }/list/BooleanList.java | 4 +- .../runtime/{runtime => }/list/ByteList.java | 4 +- .../{runtime => }/list/DoubleList.java | 4 +- .../runtime/{runtime => }/list/FloatList.java | 4 +- .../runtime/{runtime => }/list/IntList.java | 4 +- .../runtime/{runtime => }/list/ListNodes.java | 22 +- .../runtime/{runtime => }/list/LongList.java | 4 +- .../{runtime => }/list/ObjectList.java | 4 +- .../runtime/{runtime => }/list/ShortList.java | 4 +- .../{runtime => }/list/StringList.java | 4 +- .../TruffleArrayList.java} | 14 +- .../operators/OperatorNodes.java | 28 +- .../runtime/{runtime => }/or/OrObject.java | 9 +- .../primitives/BinaryObject.java | 2 +- .../{runtime => }/primitives/DateObject.java | 8 +- .../primitives/DecimalObject.java | 6 +- .../{runtime => }/primitives/ErrorObject.java | 6 +- .../primitives/IntervalObject.java | 4 +- .../primitives/LocationKVSettingHash.java | 8 +- .../primitives/LocationObject.java | 16 +- .../{runtime => }/primitives/NullObject.java | 2 +- .../{runtime => }/primitives/TimeObject.java | 4 +- .../primitives/TimestampObject.java | 4 +- .../primitives/TruffleTemporalFormatter.java | 2 +- .../record/DuplicateKeyRecord.java | 6 +- .../record/DuplicateKeyRecordNodes.java | 20 +- .../{runtime => }/record/KeysObject.java | 2 +- .../{runtime => }/record/PureRecord.java | 6 +- .../{runtime => }/record/PureRecordNodes.java | 24 +- .../{runtime => }/record/RecordNodes.java | 4 +- .../rdbms/JdbcExceptionHandler.java | 35 - .../sources/CsvReadFromStringComputeNext.java | 53 -- .../snapi/truffle/runtime/utils/IOUtils.java | 6 +- .../truffle/runtime/utils/KryoFootPrint.java | 4 +- .../runtime/utils/TruffleCharInputStream.java | 2 +- ...CharStream.java => TruffleCharStream.java} | 2 +- .../runtime/utils/TruffleInputStream.java | 14 +- ...ream.java => TruffleStringCharStream.java} | 4 +- snapi-truffle/src/main/java/module-info.java | 426 +-------- sql-compiler/src/main/java/module-info.java | 1 + .../src/main/resources/reference.conf | 18 +- .../NamedParametersPreparedStatement.scala | 49 +- .../rawlabs/sql/compiler/SqlCodeUtils.scala | 2 +- .../sql/compiler/SqlCompilerService.scala | 9 +- .../rawlabs/sql/compiler/SqlIntervals.scala | 33 +- .../rawlabs/sql/compiler/SqlTypesUtils.scala | 92 +- .../sql/compiler/antlr4/RawSqlVisitor.scala | 783 --------------- ...rListener.scala => SqlErrorListener.scala} | 12 +- .../sql/compiler/antlr4/SqlNodes.scala | 14 +- .../sql/compiler/antlr4/SqlParam.scala | 5 +- ...wSqlPositions.scala => SqlPositions.scala} | 8 +- ...Analyzer.scala => SqlSyntaxAnalyzer.scala} | 10 +- .../sql/compiler/antlr4/SqlVisitor.scala | 900 ++++++++++++++++++ ...rors.scala => SqlVisitorParseErrors.scala} | 14 +- .../sql/compiler/metadata/Completion.scala | 15 +- .../compiler/metadata/UserMetadataCache.scala | 14 +- .../writers/TypedResultSetCsvWriter.scala | 16 +- .../writers/TypedResultSetJsonWriter.scala | 17 +- .../TestNamedParametersStatement.scala | 6 +- .../sql/compiler/TestParseIntervals.scala | 10 +- .../compiler/TestSqlConnectionFailures.scala | 43 +- .../rawlabs/sql/compiler/TestSqlParser.scala | 151 ++- .../sql/parser/generated/Placeholder.java | 17 + utils-core/src/main/resources/reference.conf | 3 + .../utils/core/RawVerboseRunnable.scala | 6 +- .../utils/core/RawMultiplyingTestSuite.scala | 35 +- .../com/rawlabs/utils/core/RawTestSuite.scala | 3 +- .../utils/core/SettingsTestContext.scala | 2 +- .../utils/core/TrainingWheelsContext.scala | 1 - 1208 files changed, 8541 insertions(+), 9385 deletions(-) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala => compiler/src/test/scala/com/rawlabs/compiler/CompilerServiceTestContext.scala (71%) create mode 100644 protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto rename protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/{protocol.proto => location_config.proto} (100%) create mode 100644 protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto create mode 100644 protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_description.proto create mode 100644 protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto rename snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/{Rql2TruffleCompilerServiceBuilder.scala => Rql2CompilerServiceBuilder.scala} (77%) delete mode 100644 snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/{truffle/Rql2TruffleCompilerServiceTestContext.scala => Rql2CompilerServiceTestContext.scala} (90%) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/{api => }/Rql2OutputTestContext.scala (100%) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/{Rql2CompilerTestContext.scala => Rql2TestContext.scala} (99%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{utils => base}/Attribution.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{utils => base}/ExtraRewriters.scala (96%) delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/{InferrerProperties.scala => InferrerInput.scala} (71%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/{InputFormatDescriptors.scala => InferrerOutput.scala} (58%) delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{lsp/CompilerLspService.scala => LspAnalyzer.scala} (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{common => rql2}/PhaseDescriptor.scala (92%) delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{api/Values.scala => Rql2Values.scala} (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/{RawErrorListener.scala => Rql2ErrorListener.scala} (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/{RawPositions.scala => Rql2Positions.scala} (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/{RawSnapiVisitor.scala => Rql2SnapiVisitor.scala} (99%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/{RawVisitorParseErrors.scala => Rql2VisitorParseErrors.scala} (67%) delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{api => extensions}/LocationDescription.scala (99%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{api => extensions}/PackageExtension.scala (99%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/Aggregations.scala (93%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/AwsPackage.scala (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/BinaryPackage.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/BytePackage.scala (86%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/CollectionPackage.scala (94%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/CsvPackage.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/DatePackage.scala (92%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/DecimalPackage.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/DoublePackage.scala (86%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/EnvironmentPackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/ErrorPackage.scala (84%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/FloatPackage.scala (86%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/FunctionPackage.scala (92%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/HttpPackage.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/IntPackage.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/IntervalPackage.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/JsonPackage.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/KryoPackage.scala (94%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/LibraryPackage.scala (95%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/ListPackage.scala (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/LocationPackage.scala (95%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/LongPackage.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/MathPackage.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/MySQLPackage.scala (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/NullablePackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/NullableTryablePackage.scala (82%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/OraclePackage.scala (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/PostgreSQLPackage.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/RecordPackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/RegexPackage.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/S3Package.scala (94%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/SQLServerPackage.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/ShortPackage.scala (86%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/SnowflakePackage.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/StringPackage.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/SuccessPackage.scala (75%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/TestPackage.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/TimePackage.scala (90%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/TimestampPackage.scala (94%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/TryPackage.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/TypePackage.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ => extensions}/builtin/XmlPackage.scala (97%) delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{utils => rql2}/package.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ImplicitCasts.scala => phases/ImplicitCastsPhase.scala} (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{ListProjDesugarer.scala => phases/ListProjDesugarerPhase.scala} (84%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{Propagation.scala => phases/PropagationPhase.scala} (95%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/{SugarExtensionDesugarer.scala => phases/SugarExtensionDesugarerPhase.scala} (85%) rename snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/{RD10260.scala => RD10260Test.scala} (91%) rename snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/{RD10439.scala => RD10439Test.scala} (95%) rename snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/{RD3852.scala => RD3852Test.scala} (73%) rename snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/{Antlr4LSPTests.scala => Antlr4LspTests.scala} (98%) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala => snapi-parser/src/main/java/com/rawlabs/snapi/parser/generated/Placeholder.java (57%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/RawContext.java => Rql2Context.java} (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/RawLanguage.java => Rql2Language.java} (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/RawLanguageCache.java => Rql2LanguageCache.java} (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/RawOptions.java => Rql2Options.java} (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/RawTypes.java => Rql2Types.java} (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/BinaryNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => ast}/ExpressionNode.java (68%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/ProgramExpressionNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/ProgramStatementNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => ast}/PropertyType.java (96%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => ast}/StatementNode.java (97%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/boundary/RawTruffleBoundaries.java => ast/TruffleBoundaries.java} (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/TypeGuards.java (99%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/controlflow/ExpBlockNode.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/controlflow/IfThenElseNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/aggregation/AggregateMultipleNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/aggregation/AggregateSingleNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/aggregation/Aggregations.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/aggregation/AggregatorNodes.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/AndNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/DivNode.java (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/EqNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/GeNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/GtNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/LeNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/LtNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/ModNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/MultNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/OrNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/PlusNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/binary/SubNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/binary_package/BinaryBase64Node.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/binary_package/BinaryFromStringNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/binary_package/BinaryReadNode.java (67%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java (60%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/http_package/HttpReadNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/jdbc/JdbcQueryNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationDescribeNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromHttpNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromMySQLNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromOracleNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromS3Node.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationFromStringNode.java (68%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationLlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/location_package/LocationLsNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathAbsNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathAcosNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathAsinNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathAtanNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathAtn2Node.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathCeilingNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathCosNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathCotNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathDegreesNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathExpNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathFloorNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathLog10Node.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathLogNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathPowerNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathRadiansNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathSignNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathSinNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathSqrtNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathSquareNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/math_package/MathTanNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/float_package/FloatFromNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/int_package/IntFromNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/int_package/IntRangeNode.java (67%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/long_package/LongFromNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/long_package/LongRangeNode.java (67%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/numeric/short_package/ShortFromNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/regex_package/RegexCache.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/regex_package/RegexGroupsNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/regex_package/RegexMatchesNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/regex_package/RegexReplaceNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringBase64Node.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringCapitalizeNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringContainsNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringCountSubStringNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringDecodeNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringEmptyNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringEncodeNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringFromNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringLTrimNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringLengthNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringLowerNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringRTrimNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringReadLinesNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringReadNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringReplaceNode.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringReplicateNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringReverseNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringSplitNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringStartsWithNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringSubStringNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringTrimNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/string_package/StringUpperNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/DateTimeFormatCache.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateBuildNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateDayNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateMonthNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateNowNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateParseNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/date_package/DateYearNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeHourNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeNowNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeParseNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java (62%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/type_package/TypeMatchNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java (68%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java (70%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/function/ClosureNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/function/InvokeNode.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/function/InvokeNodes.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/function/MethodNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/function/RecClosureNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/ArrayOperationNodes.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionBuildNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionDistinctNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionEquiJoinNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionExistsNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionFilterNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionFirstNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionFromNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionGroupByNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionJoinNode.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionMkStringNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionOrderByNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionTakeNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionTransformNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionTupleAvgNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionUnionNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionUnnestNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/collection/CollectionZipNode.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListBuildNode.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListCountNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListExistsNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListFilterNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListFirstNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListFromNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListFromUnsafe.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListGetNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListGroupByNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListLastNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListTakeNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/iterable/list/ListTransformNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/BinaryConstNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/BoolNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/ByteNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/DecimalNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/DoubleNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/FloatNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/IntNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/LocationConstNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/LongNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/ShortNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/StringNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/UndefinedNode.java (66%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/UnitNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/literals/ZeroedConstNode.java (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionFlatMapNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionGetOrElseNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionIsDefinedNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionMapNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionNoneNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionSomeNode.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/option/OptionUnsafeGetNode.java (69%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordAddFieldNode.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordBuildNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordConcatNode.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordFieldsNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordProjNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordRemoveFieldNode.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/record/RecordStaticInitializers.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableFailureNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableFailureWithTypeNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableFlatMapNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableGetFailureNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableIsFailureNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableIsSuccessNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableMapNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableNullableFlatMapNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableSuccessNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/tryable/TryableUnsafeGetNode.java (67%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/unary/NegNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/unary/NotNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/expressions/unary/NotNullNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/binary/BinaryBytesWriterNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/binary/BinaryWriterNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/binary/NullableBinaryWriterNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/binary/TryableBinaryWriterNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/CsvParserNodes.java (58%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/BoolParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/DateParseCsvNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/DecimalParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/DoubleParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/IntParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/IterableParseCsvFile.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/IterableParseCsvString.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/LongParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionByteParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionDateParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionIntParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionLongParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionShortParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionStringParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/RecordParseCsvNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/ShortParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/StringParseCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/TimeParseCsvNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/TimestampParseCsvNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java => ast/io/csv/reader/parser/TruffleCsvParser.java} (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java => ast/io/csv/reader/parser/TruffleCsvParserSettings.java} (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/TryableParseCsvNode.java (68%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/reader/parser/UndefinedParseCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/CsvIterableWriterNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/CsvListWriterNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/BinaryWriteCsvNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/BoolWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/ByteWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/DateWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/DecimalWriteCsvNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/DoubleWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/FloatWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/IntWriteCsvNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/LongWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/NullableWriteCsvNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/RecordWriteCsvNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/ShortWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/StringWriteCsvNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/TimeWriteCsvNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/TimestampWriteCsvNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/csv/writer/internal/TryableWriteCsvNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/BinaryReadJdbcQuery.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/BoolReadJdbcQuery.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/ByteReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/DateReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/DecimalReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/DoubleReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/FloatReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/IntReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/JdbcQuery.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/LongReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/NullableReadJdbcQuery.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/RecordReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/ShortReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/StringReadJdbcQuery.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/TimeReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/TimestampReadJdbcQuery.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/jdbc/TryableReadJdbcQuery.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/JsonParseNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/JsonParserNodes.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/JsonPrintNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/JsonReadCollectionNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/JsonReadValueNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/TryableTopLevelWrapper.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/AnyParseJsonNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/BinaryParseJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/BooleanParseJsonNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/ByteParseJsonNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/CheckNonNullJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/DateParseJsonNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/DecimalParseJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/DoubleParseJsonNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/FloatParseJsonNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/IntParseJsonNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/IntervalParseJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/IterableParseJsonNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/ListParseJsonNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/LongParseJsonNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/NullableParseJsonNode.java (69%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/OrParseJsonNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/RecordParseJsonNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/ShortParseJsonNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/StringParseJsonNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/TimeParseJsonNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/TimestampParseJsonNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/TryableParseJsonNode.java (66%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/reader/parser/UndefinedParseJsonNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/JsonWriteNodes.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/JsonWriterNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/AnyWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/BinaryWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/BooleanWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/ByteWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/DateWriteJsonNode.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/DecimalWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/DoubleWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/FloatWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/IntWriteJsonNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/IntervalWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/IterableWriteJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/ListWriteJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/LongWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/NullableWriteJsonNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/OrWriteJsonNode.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/RecordWriteJsonNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/ShortWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/StringWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/TimeWriteJsonNode.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/TimestampWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/TryableWriteJsonNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/json/writer/internal/UndefinedWriteJsonNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/kryo/KryoFromNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/kryo/KryoWriteNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/BoolParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/ByteParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/DateParseXmlNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/DecimalParseXmlNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/DoubleParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/FloatParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/IntParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/IterableParseXmlNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/LongParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/NullableParseXmlNode.java (66%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/OptionParseXmlTextNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/OrTypeParseXml.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/RecordParseXmlNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/ShortParseXmlNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/StringParseXmlNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/TextParseXmlPrimitiveNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/TimeParseXmlNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/TimestampParseXmlNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/ast/io/xml/parser/RawTruffleXmlParser.java => ast/io/xml/parser/TruffleXmlParser.java} (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java => ast/io/xml/parser/TruffleXmlParserFactory.java} (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java => ast/io/xml/parser/TruffleXmlParserSettings.java} (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/TryableParseAttributeXmlNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/TryableParseXmlNode.java (69%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/UndefinedParseXmlNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/XmlParseCollectionNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/XmlParseValueNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/XmlReadCollectionNode.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/io/xml/parser/XmlReadValueNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/local/ReadClosureVariableNode.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/local/ReadLocalVariableNode.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/local/ReadParamClosureNode.java (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/local/ReadParamNode.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/local/WriteLocalVariableNode.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/OSRGeneratorNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRCollectionFilterBodyNode.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRCollectionMkStringBodyNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRDistinctGetGeneratorNode.java (68%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSREquiJoinNextBodyNode.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRExistsBodyNode.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRJoinNextBodyNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRListFilterBodyNode.java (75%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRListFromBodyNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRListParseJsonBodyNode.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRListTransformBodyNode.java (76%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRMultiAggregationBodyNode.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSROrderByGetGeneratorNode.java (69%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRSingleAggregationBodyNode.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/bodies/OSRToArrayBodyNode.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/conditions/OSRCollectionFilterConditionNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/conditions/OSRExistsConditionNode.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/conditions/OSRFromBodyConditionNode.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/conditions/OSRHasNextConditionNode.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => }/ast/osr/conditions/OSRListParseJsonConditionNode.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => ast}/tryable_nullable/Nullable.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => ast}/tryable_nullable/Tryable.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{runtime => ast}/tryable_nullable/TryableNullableNodes.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{compiler => }/SlotLocation.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{compiler => }/SnapiTruffleEmitter.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{compiler => }/TruffleBuildBody.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{compiler => }/TruffleEmit.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{compiler => }/TruffleEntrypoint.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{output => writers}/CompilerScalaConsts.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{output => writers}/CsvWriter.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{output => writers}/JsonWriter.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/{output => writers}/TruffleBinaryWriter.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/data_structures/treemap/TreeMapIterator.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/data_structures/treemap/TreeMapNode.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/data_structures/treemap/TreeMapNodes.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/data_structures/treemap/TreeMapObject.java (97%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/data_structures/treemap/TreeMapStatic.java (95%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/BreakException.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/ReadLinesRawTruffleException.java => exceptions/ReadLinesTruffleException.java} (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/RawTruffleInternalErrorException.java => exceptions/TruffleInternalErrorException.java} (65%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/RawTruffleRuntimeException.java => exceptions/TruffleRuntimeException.java} (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/RawTruffleUnexpectedNullException.java => exceptions/TruffleUnexpectedNullException.java} (65%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/RawTruffleValidationException.java => exceptions/TruffleValidationException.java} (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/json/JsonWriterRawTruffleException.java => exceptions/binary/BinaryWriterTruffleException.java} (61%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/csv/CsvExpectedNothingException.java (58%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/csv/CsvParserRawTruffleException.java => exceptions/csv/CsvParserTruffleException.java} (65%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/csv/CsvReaderRawTruffleException.java => exceptions/csv/CsvReaderTruffleException.java} (62%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/csv/CsvWriterRawTruffleException.java => exceptions/csv/CsvWriterTruffleException.java} (64%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/json/JsonExpectedNothingException.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/json/JsonOrTypeException.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/json/JsonParserRawTruffleException.java => exceptions/json/JsonParserTruffleException.java} (58%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/json/JsonReaderRawTruffleException.java => exceptions/json/JsonReaderTruffleException.java} (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/json/JsonRecordFieldNotFoundException.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/json/JsonUnexpectedTokenException.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/binary/BinaryWriterRawTruffleException.java => exceptions/json/JsonWriterTruffleException.java} (60%) create mode 100644 snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/rdbms/JdbcParserRawTruffleException.java => exceptions/rdbms/JdbcParserTruffleException.java} (64%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java => exceptions/rdbms/JdbcReaderTruffleException.java} (62%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/rdbms/MySQLExceptionHandler.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/rdbms/OracleExceptionHandler.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/rdbms/PostgreSQLExceptionHandler.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/rdbms/SnowflakeExceptionHandler.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/rdbms/SqlServerExceptionHandler.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/validation/ValidationErrorMessage.java (95%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/validation/ValidationErrorObject.java (96%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/validation/ValidationErrorPosition.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/validation/ValidationErrorRange.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/xml/XmlExpectedNothingException.java (65%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/exceptions/xml/XmlOrTypeParserException.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/xml/XmlParserRawTruffleException.java => exceptions/xml/XmlParserTruffleException.java} (66%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/exceptions/xml/XmlReaderRawTruffleException.java => exceptions/xml/XmlReaderTruffleException.java} (60%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/function/Closure.java (98%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/function/Function.java (95%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/function/FunctionExecuteNodes.java (98%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/function/RawFunctionRegistry.java => function/FunctionRegistry.java} (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/function/FunctionRegistryObject.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/function/Lambda.java (98%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/function/RecClosure.java (98%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/GeneratorNodes.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/StaticInitializers.java (69%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/AbstractGenerator.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java (97%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java (97%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java (68%) create mode 100644 snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java (81%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java (53%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java (69%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/record_shaper/RecordShaper.java (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/generator/list/ListGenerator.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/IterableNodes.java (88%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/list/ListIterable.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/DistinctCollection.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/EquiJoinCollection.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/FilterCollection.java (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/GroupByCollection.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/JoinCollection.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/OrderByCollection.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/TakeCollection.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/TransformCollection.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/UnnestCollection.java (87%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/operations/ZipCollection.java (80%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/CsvCollection.java (72%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/CsvFromStringCollection.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/EmptyCollection.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/ExpressionCollection.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/IntRangeCollection.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/JdbcQueryCollection.java (78%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/JsonReadCollection.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/LongRangeCollection.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/ReadLinesCollection.java (79%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/TimestampRangeCollection.java (74%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/UnionCollection.java (77%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/XmlParseCollection.java (71%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/iterable/sources/XmlReadCollection.java (73%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/kryo/KryoNodes.java (95%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/BooleanList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/ByteList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/DoubleList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/FloatList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/IntList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/ListNodes.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/LongList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/ObjectList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/ShortList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/list/StringList.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime/list/RawArrayList.java => list/TruffleArrayList.java} (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/operators/OperatorNodes.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/or/OrObject.java (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/BinaryObject.java (97%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/DateObject.java (85%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/DecimalObject.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/ErrorObject.java (82%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/IntervalObject.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/LocationKVSettingHash.java (83%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/LocationObject.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/NullObject.java (94%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/TimeObject.java (86%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/TimestampObject.java (89%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/primitives/TruffleTemporalFormatter.java (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/record/DuplicateKeyRecord.java (97%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/record/DuplicateKeyRecordNodes.java (93%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/record/KeysObject.java (95%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/record/PureRecord.java (96%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/record/PureRecordNodes.java (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/{runtime => }/record/RecordNodes.java (97%) delete mode 100644 snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java delete mode 100644 snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/{RawTruffleCharStream.java => TruffleCharStream.java} (92%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/{RawTruffleStringCharStream.java => TruffleStringCharStream.java} (84%) delete mode 100644 sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala rename sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/{RawSqlErrorListener.scala => SqlErrorListener.scala} (90%) rename sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/{RawSqlPositions.scala => SqlPositions.scala} (86%) rename sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/{RawSqlSyntaxAnalyzer.scala => SqlSyntaxAnalyzer.scala} (86%) create mode 100644 sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitor.scala rename sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/{RawSqlVisitorParseErrors.scala => SqlVisitorParseErrors.scala} (66%) create mode 100644 sql-parser/src/main/java/com/rawlabs/sql/parser/generated/Placeholder.java diff --git a/build.sbt b/build.sbt index a5772e3fc..feaf2d262 100644 --- a/build.sbt +++ b/build.sbt @@ -36,8 +36,8 @@ writeVersionToFile := { lazy val root = (project in file(".")) .aggregate( - protocolCompiler, protocolRaw, + protocolCompiler, utilsCore, utilsSources, compiler, @@ -115,12 +115,16 @@ lazy val protocolRaw = (project in file("protocol-raw")) ) lazy val protocolCompiler = (project in file("protocol-compiler")) + .dependsOn( + protocolRaw % "compile->compile;test->test;protobuf->protobuf" + ) .enablePlugins(ProtobufPlugin) .settings( commonSettings, commonCompileSettings, testSettings, ProtobufConfig / version := "3.25.4", + ProtobufConfig / protobufIncludePaths += (protocolRaw / ProtobufConfig / sourceDirectory).value, // Include the protobuf files in the JAR Compile / unmanagedResourceDirectories += (ProtobufConfig / sourceDirectory).value ) @@ -142,20 +146,16 @@ lazy val snapiParser = (project in file("snapi-parser")) .settings( commonSettings, commonCompileSettings, - javaSrcBasePath := s"${baseDirectory.value}/src/main/java", parserDefinitions := List( ( - s"${javaSrcBasePath.value}/com/rawlabs/snapi/parser/generated", + s"${(Compile / sourceManaged).value}/java/com/rawlabs/snapi/parser/generated", "com.rawlabs.snapi.parser.generated", - s"${javaSrcBasePath.value}/com/rawlabs/snapi/parser/grammar", + s"${(Compile / sourceDirectory).value}/java/com/rawlabs/snapi/parser/grammar", "Snapi" ) ), Compile / doc := { file("/dev/null") }, - compileOrder := CompileOrder.JavaThenScala, - libraryDependencies ++= Seq( - antlr4Runtime - ) + libraryDependencies += antlr4Runtime ) lazy val snapiFrontend = (project in file("snapi-frontend")) @@ -274,20 +274,16 @@ lazy val sqlParser = (project in file("sql-parser")) .settings( commonSettings, commonCompileSettings, - javaSrcBasePath := s"${baseDirectory.value}/src/main/java", parserDefinitions := List( ( - s"${javaSrcBasePath.value}/com/rawlabs/sql/parser/generated", + s"${(Compile / sourceManaged).value}/java/com/rawlabs/sql/parser/generated", "com.rawlabs.sql.parser.generated", - s"${javaSrcBasePath.value}/com/rawlabs/sql/parser/grammar", + s"${(Compile / sourceDirectory).value}/java/com/rawlabs/sql/parser/grammar", "Psql" ) ), Compile / doc := { file("/dev/null") }, - compileOrder := CompileOrder.JavaThenScala, - libraryDependencies ++= Seq( - antlr4Runtime - ) + libraryDependencies += antlr4Runtime ) lazy val sqlCompiler = (project in file("sql-compiler")) diff --git a/compiler/src/main/java/module-info.java b/compiler/src/main/java/module-info.java index a3de8c2fc..e41079780 100644 --- a/compiler/src/main/java/module-info.java +++ b/compiler/src/main/java/module-info.java @@ -23,6 +23,7 @@ requires com.fasterxml.jackson.datatype.jsr310; requires com.fasterxml.jackson.datatype.jdk8; requires raw.utils.core; + requires raw.protocol.raw; requires raw.protocol.compiler; exports com.rawlabs.compiler; diff --git a/compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala b/compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala index f5343bf0c..24a2ebd38 100644 --- a/compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/CompilerService.scala @@ -12,12 +12,10 @@ package com.rawlabs.compiler -import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} import org.graalvm.polyglot.Engine import java.io.OutputStream import scala.collection.mutable -import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} import com.rawlabs.utils.core.{RawException, RawService, RawSettings} // Exception that wraps the underlying error so that it includes the extra debug info. @@ -173,40 +171,13 @@ final case class ExecutionSuccess(complete: Boolean) extends ExecutionResponse final case class ExecutionValidationFailure(errors: List[ErrorMessage]) extends ExecutionResponse final case class ExecutionRuntimeFailure(error: String) extends ExecutionResponse -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") -@JsonSubTypes( - Array( - new JsonType(value = classOf[FormatCodeResponse], name = "formatCode"), - new JsonType(value = classOf[AutoCompleteResponse], name = "autoComplete"), - new JsonType(value = classOf[HoverResponse], name = "hover"), - new JsonType(value = classOf[GoToDefinitionResponse], name = "definition"), - new JsonType(value = classOf[RenameResponse], name = "rename"), - new JsonType(value = classOf[ErrorResponse], name = "error"), - new JsonType(value = classOf[ValidateResponse], name = "validate") - ) -) -sealed trait ClientLspResponse -final case class FormatCodeResponse(code: Option[String]) extends ClientLspResponse -final case class HoverResponse(completion: Option[Completion]) extends ClientLspResponse -final case class RenameResponse(positions: Array[Pos]) extends ClientLspResponse -final case class GoToDefinitionResponse(position: Option[Pos]) extends ClientLspResponse -final case class ValidateResponse(messages: List[Message]) extends ClientLspResponse -final case class ErrorResponse(errors: List[ErrorMessage]) extends ClientLspResponse -final case class AutoCompleteResponse(completions: Array[Completion]) extends ClientLspResponse - -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") -@JsonSubTypes( - Array( - new JsonType(value = classOf[TypeCompletion], name = "tipe"), - new JsonType(value = classOf[FieldCompletion], name = "field"), - new JsonType(value = classOf[LetBindCompletion], name = "bind"), - new JsonType(value = classOf[LetFunCompletion], name = "function"), - new JsonType(value = classOf[LetFunRecCompletion], name = "recursiveFunction"), - new JsonType(value = classOf[FunParamCompletion], name = "functionParameter"), - new JsonType(value = classOf[PackageCompletion], name = "package"), - new JsonType(value = classOf[PackageEntryCompletion], name = "packageEntry") - ) -) +final case class FormatCodeResponse(code: Option[String]) +final case class HoverResponse(completion: Option[Completion]) +final case class RenameResponse(positions: Array[Pos]) +final case class GoToDefinitionResponse(position: Option[Pos]) +final case class ValidateResponse(messages: List[Message]) +final case class AutoCompleteResponse(completions: Array[Completion]) + sealed trait Completion final case class TypeCompletion(name: String, tipe: String) extends Completion final case class FieldCompletion(name: String, tipe: String) extends Completion diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala b/compiler/src/test/scala/com/rawlabs/compiler/CompilerServiceTestContext.scala similarity index 71% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala rename to compiler/src/test/scala/com/rawlabs/compiler/CompilerServiceTestContext.scala index d06d9abe5..2650e941e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2CompilerServiceTestContext.scala +++ b/compiler/src/test/scala/com/rawlabs/compiler/CompilerServiceTestContext.scala @@ -10,22 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.compiler +package com.rawlabs.compiler -import com.rawlabs.compiler.CompilerServiceProvider import com.rawlabs.utils.core.RawTestSuite import org.scalatest.BeforeAndAfterAll -trait Rql2CompilerServiceTestContext extends BeforeAndAfterAll { +trait CompilerServiceTestContext extends BeforeAndAfterAll { this: RawTestSuite => - private var instance: Rql2CompilerService = _ + private var instance: CompilerService = _ private var language: Set[String] = _ - def compilerService: Rql2CompilerService = instance + def compilerService: CompilerService = instance - def setCompilerService(compilerService: Rql2CompilerService): Unit = { + def setCompilerService(compilerService: CompilerService): Unit = { // Remember the language we have set. if (compilerService != null) { language = compilerService.language diff --git a/project/GenParserPlugin.scala b/project/GenParserPlugin.scala index fba1f6293..407186dcf 100644 --- a/project/GenParserPlugin.scala +++ b/project/GenParserPlugin.scala @@ -1,16 +1,13 @@ package raw.build -import sbt.Keys._ -import sbt.{Def, _} +import sbt.Keys.* +import sbt.* import sbt.plugins.JvmPlugin -import com.jsuereth.sbtpgp.PgpKeys.{publishSigned} import java.io.{File, FileInputStream, IOException} -import java.net.URL import java.security.MessageDigest -import scala.util.control.Breaks._ - -import scala.sys.process._ +import scala.util.control.Breaks.* +import scala.sys.process.* object GenParserPlugin extends AutoPlugin { override def requires = JvmPlugin @@ -18,26 +15,25 @@ object GenParserPlugin extends AutoPlugin { // Task keys object autoImport { - val generateParser = taskKey[Unit]("Generated antlr4 base parser and lexer") - val parserDefinitions = settingKey[List[(String, String, String, String)]]("List of parser definitions with output path first followed by the name of the generated package") - val javaSrcBasePath = settingKey[String]("Java src relative path") + val generateParser = taskKey[Seq[File]]("Generated antlr4 base parser and lexer") + val parserDefinitions = settingKey[List[(String, String, String, String)]]( + "List of parser definitions with output path first followed by the name of the generated package" + ) } import autoImport._ // Provide default settings override def projectSettings: Seq[Def.Setting[_]] = Seq( - generateParser := { val s: TaskStreams = streams.value - val basePath: String = javaSrcBasePath.value val parsers = parserDefinitions.value // Ensure antlr jar is available val antlrJarPath = (ThisBuild / baseDirectory).value / "antlr-4.12.0-complete.jar" val antlrJarChecksum = "88f18a2bfac0dde1009eda5c7dce358a52877faef7868f56223a5bcc15329e43" - ensureAntlrJarAvailable(antlrJarPath.toString(), antlrJarChecksum, s) + ensureAntlrJarAvailable(antlrJarPath, antlrJarChecksum, s) def deleteRecursively(file: File): Unit = { if (file.isDirectory) { @@ -59,14 +55,14 @@ object GenParserPlugin extends AutoPlugin { sys.error(s"Java binary not found at $javaBin") } - parsers.foreach(parser => { - val outputPath = parser._1 + val generatedFiles = parsers.flatMap { parser => + val outputPath: String = parser._1 val file = new File(outputPath) if (file.exists()) { deleteRecursively(file) } val packageName: String = parser._2 - val command: String = s"$javaBin -jar ${antlrJarPath} -visitor -package $packageName -o $outputPath" + val command: String = s"$javaBin -jar $antlrJarPath -visitor -package $packageName -o $outputPath" val output = new StringBuilder val logger = ProcessLogger( (o: String) => output.append(o + "\n"), // for standard output @@ -74,7 +70,7 @@ object GenParserPlugin extends AutoPlugin { ) val grammarPath = parser._3 val grammarName = parser._4 - val lexerResult = s"$command $grammarPath/${grammarName}Lexer.g4".!(logger) + val lexerResult = s"$command $grammarPath/${grammarName}Lexer.g4".!(logger) if (lexerResult == 0) { s.log.info("Lexer code generated successfully") } else { @@ -90,19 +86,22 @@ object GenParserPlugin extends AutoPlugin { s.log.error("Output:\n" + output.toString) throw new RuntimeException("Parser code generation failed.") } - }) + new File(outputPath).listFiles.filter(_.isFile).filter(_.getName.endsWith(".java")) + } + + generatedFiles }, parserDefinitions := List(), - javaSrcBasePath := "", - Compile / compile := (Compile / compile).dependsOn(generateParser).value, - Test / test := (Test / test).dependsOn(generateParser).value, - publish := publish.dependsOn(generateParser).value, - publishSigned := publishSigned.dependsOn(generateParser).value + Compile / sourceGenerators += generateParser.taskValue ) - //Ensure ANTLR JAR is downloaded if not present - def ensureAntlrJarAvailable(jarPath: String, expectedChecksum: String, s: TaskStreams, maxRetries: Int = 3): Unit = { - val jarFile = new File(jarPath) + // Ensure ANTLR JAR is downloaded if not present + private def ensureAntlrJarAvailable( + jarFile: File, + expectedChecksum: String, + s: TaskStreams, + maxRetries: Int = 3 + ): Unit = { if (!jarFile.exists() || !verifyChecksum(jarFile, expectedChecksum)) { val jarName = jarFile.getName val url = s"https://github.com/antlr/website-antlr4/raw/gh-pages/download/$jarName" @@ -133,17 +132,15 @@ object GenParserPlugin extends AutoPlugin { } } - def verifyChecksum(file: File, expectedChecksum: String): Boolean = { - val buffer = new Array[Byte](64) - val sha256 = MessageDigest.getInstance("SHA-256") - val fis = new FileInputStream(file) + private def verifyChecksum(file: File, expectedChecksum: String): Boolean = { + val buffer = new Array[Byte](64) + val sha256 = MessageDigest.getInstance("SHA-256") + val fis = new FileInputStream(file) - Stream.continually(fis.read(buffer)).takeWhile(_ != -1).foreach { read => - sha256.update(buffer, 0, read) - } - fis.close() + Stream.continually(fis.read(buffer)).takeWhile(_ != -1).foreach(read => sha256.update(buffer, 0, read)) + fis.close() - val fileChecksum = sha256.digest().map("%02x".format(_)).mkString - fileChecksum.equalsIgnoreCase(expectedChecksum) - } + val fileChecksum = sha256.digest().map("%02x".format(_)).mkString + fileChecksum.equalsIgnoreCase(expectedChecksum) + } } diff --git a/protocol-compiler/src/main/java/module-info.java b/protocol-compiler/src/main/java/module-info.java index 921c1af34..641f399aa 100644 --- a/protocol-compiler/src/main/java/module-info.java +++ b/protocol-compiler/src/main/java/module-info.java @@ -12,6 +12,7 @@ module raw.protocol.compiler { requires com.google.protobuf; + requires raw.protocol.raw; exports com.rawlabs.protocol.compiler; } diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto new file mode 100644 index 000000000..ed9d852d0 --- /dev/null +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto @@ -0,0 +1,67 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.compiler"; +option java_multiple_files = true; + +package com.rawlabs.protocol.compiler; + +message PackageDoc { + string description = 1; + optional string info = 2; + optional string warning = 3; + optional string danger = 4; +} + +message EntryCompletion { + string name = 1; + EntryDoc doc = 2; +} + +message EntryDoc { + string summary = 1; + optional string description = 2; + repeated ExampleDoc examples = 3; + repeated ParamDoc params = 4; + optional ReturnDoc ret = 5; + optional string info = 6; + optional string warning = 7; + optional string danger = 8; +} + +message ExampleDoc { + string example = 1; + optional string result = 2; +} + +message ParamDoc { + string name = 1; + TypeDoc typeDoc = 2; + string description = 3; + bool isOptional = 4; + bool isVarArg = 5; + optional string info = 6; + optional string warning = 7; + optional string danger = 8; + optional string customSyntax = 9; +} + +message ReturnDoc { + string description = 1; + optional TypeDoc retType = 2; +} + +message TypeDoc { + repeated string possibleTypes = 1; +} \ No newline at end of file diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/protocol.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/location_config.proto similarity index 100% rename from protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/protocol.proto rename to protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/location_config.proto diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto new file mode 100644 index 000000000..14c746b5b --- /dev/null +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto @@ -0,0 +1,40 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.compiler"; +option java_multiple_files = true; + +package com.rawlabs.protocol.compiler; + +message Message { + string message = 1; + repeated Range positions = 2; + optional string code = 3; + enum Severity { + HINT = 0; + INFO = 10; + WARNING = 20; + ERROR = 99; + } +} + +message Range { + Position begin = 1; + Position end = 2; +} + +message Position { + uint32 line = 1; + uint32 column = 2; +} diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_description.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_description.proto new file mode 100644 index 000000000..f0f85b68d --- /dev/null +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_description.proto @@ -0,0 +1,49 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.compiler"; +option java_multiple_files = true; + +package com.rawlabs.protocol.compiler; + +import "com/rawlabs/protocol/raw/types.proto"; +import "com/rawlabs/protocol/raw/values.proto"; + +message ProgramDescription { + map decls = 1; + optional Decl body = 2; + optional string comment = 3; +} + +message Decls { + repeated Decl decls = 1; +} + +message Decl { + optional Params params = 1; + optional com.rawlabs.protocol.raw.Type outType = 2; + optional string comment = 3; +} + +message Params { + repeated Param params = 1; +} + +message Param { + string name = 1; + com.rawlabs.protocol.raw.Type tipe = 2; + optional com.rawlabs.protocol.raw.Value defaultValue = 3; + optional string comment = 4; + bool required = 5; +} diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto new file mode 100644 index 000000000..4e8fc78f6 --- /dev/null +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto @@ -0,0 +1,40 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.compiler"; +option java_multiple_files = true; + +package com.rawlabs.protocol.compiler; + +import "com/rawlabs/protocol/compiler/location_config.proto"; + +message ProgramEnvironment { + string uid = 1; + optional Arguments arguments = 2; + repeated string scopes = 3; + map secrets = 4; + map locationConfigs = 5; + map options = 6; + optional string jdbcUrl = 7; + optional string traceId = 8; +} + +message Arguments { + repeated Argument arguments = 1; +} + +message Argument { + string name = 1; + string value = 2; +} \ No newline at end of file diff --git a/snapi-compiler/src/main/java/module-info.java b/snapi-compiler/src/main/java/module-info.java index fb0d04aeb..62091979a 100644 --- a/snapi-compiler/src/main/java/module-info.java +++ b/snapi-compiler/src/main/java/module-info.java @@ -11,7 +11,7 @@ */ import com.rawlabs.compiler.CompilerServiceBuilder; -import com.rawlabs.snapi.compiler.Rql2TruffleCompilerServiceBuilder; +import com.rawlabs.snapi.compiler.Rql2CompilerServiceBuilder; module raw.snapi.client { requires scala.library; @@ -21,6 +21,7 @@ requires com.fasterxml.jackson.dataformat.csv; requires com.fasterxml.jackson.core; requires raw.utils.sources; + requires raw.protocol.raw; requires raw.protocol.compiler; requires raw.compiler; requires raw.snapi.frontend; @@ -28,5 +29,5 @@ uses CompilerServiceBuilder; provides CompilerServiceBuilder with - Rql2TruffleCompilerServiceBuilder; + Rql2CompilerServiceBuilder; } diff --git a/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder b/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder index 1d8e36816..4028de508 100644 --- a/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder +++ b/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder @@ -1 +1 @@ -com.rawlabs.snapi.compiler.Rql2TruffleCompilerServiceBuilder \ No newline at end of file +com.rawlabs.snapi.compiler.Rql2CompilerServiceBuilder \ No newline at end of file diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala index 9acd854a1..116c1917d 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala @@ -12,23 +12,702 @@ package com.rawlabs.snapi.compiler -import com.rawlabs.compiler.{CompilerService, Message, ProgramEnvironment} -import com.rawlabs.utils.core.RawUid +import com.rawlabs.compiler.{ + AutoCompleteResponse, + CompilerService, + CompilerServiceException, + DeclDescription, + ErrorMessage, + ErrorPosition, + ErrorRange, + ExecutionResponse, + ExecutionRuntimeFailure, + ExecutionSuccess, + ExecutionValidationFailure, + FormatCodeResponse, + GetProgramDescriptionFailure, + GetProgramDescriptionResponse, + GetProgramDescriptionSuccess, + GoToDefinitionResponse, + HoverResponse, + Message, + ParamDescription, + Pos, + ProgramDescription, + ProgramEnvironment, + RawBool, + RawByte, + RawDate, + RawDecimal, + RawDouble, + RawFloat, + RawInt, + RawInterval, + RawLong, + RawNull, + RawShort, + RawString, + RawTime, + RawTimestamp, + RawValue, + RenameResponse, + ValidateResponse +} +import com.rawlabs.compiler.writers.{PolyglotBinaryWriter, PolyglotTextWriter} +import com.rawlabs.snapi.compiler.writers.{Rql2CsvWriter, Rql2JsonWriter} +import com.rawlabs.utils.core.{RawSettings, RawUid, RawUtils} +import org.bitbucket.inkytonik.kiama.relation.LeaveAlone +import org.bitbucket.inkytonik.kiama.util.{Position, Positions} +import org.graalvm.polyglot._ +import com.rawlabs.snapi.frontend.base +import com.rawlabs.snapi.frontend.base.errors._ import com.rawlabs.snapi.frontend.base.source.{BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source.SourceProgram +import com.rawlabs.snapi.frontend.base.{CompilerContext, TreeDeclDescription, TreeDescription, TreeParamDescription} +import com.rawlabs.snapi.frontend.rql2.source.{SourceNode, SourceProgram} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult, ParseTypeResult, ParserErrors} +import com.rawlabs.snapi.frontend.rql2.errors._ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.inferrer.api.InferrerServiceProvider +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{BinaryPackage, CsvPackage, JsonPackage, StringPackage} + +import java.io.{IOException, OutputStream} +import scala.collection.mutable +import scala.util.control.NonFatal + +object Rql2CompilerService { + val LANGUAGE: Set[String] = Set("rql2", "rql2-truffle", "snapi") + + val JARS_PATH = "com.rawlabs.snapi.compiler.jars-path" +} + +class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protected val settings: RawSettings) + extends CompilerService + with CustomClassAndModuleLoader + with Rql2TypeUtils { + + private val maybeTruffleClassLoader: Option[ClassLoader] = { + // If defined, contains the path used to create a classloader for the Truffle language runtime. + val maybeJarsPath = settings.getStringOpt(Rql2CompilerService.JARS_PATH) + + // If the jars path is defined, create a custom class loader. + maybeJarsPath.map(jarsPath => createCustomClassAndModuleLoader(jarsPath)) + } + + private val (engine, initedEngine) = engineDefinition + + // The default constructor allows an Engine to be specified, plus a flag to indicate whether it was created here + // or externally. That's necessary for the test framework. + // This is actually the "default constructor" which obtains a new engine or reuses an existing one. + // Note that the engine will be released when the service is stopped only IF this auxiliary constructor created it. + // Otherwise, we expect the external party - e.g. the test framework - to close it. + // Refer to Rql2TruffleCompilerServiceTestContext to see the engine being created and released from the test + // framework, so that every test suite instance has a fresh engine. + def this()(implicit settings: RawSettings) = { + this(CompilerService.getEngine) + } + + override def language: Set[String] = Rql2CompilerService.LANGUAGE + + // Map of users to compiler context. + private val compilerContextCaches = new mutable.HashMap[RawUid, CompilerContext] + private val compilerContextCachesLock = new Object -trait Rql2CompilerService extends CompilerService { + private def getCompilerContext(user: RawUid): CompilerContext = { + compilerContextCachesLock.synchronized { + compilerContextCaches.getOrElseUpdate(user, createCompilerContext(user, "rql2-truffle")) + } + } - def prettyPrint(node: BaseNode, user: RawUid): String + private def createCompilerContext(user: RawUid, language: String): CompilerContext = { + // Initialize inferrer + val inferrer = InferrerServiceProvider() - def parseType(tipe: String, user: RawUid, internal: Boolean = false): ParseTypeResponse + // Initialize compiler context + new CompilerContext(language, user, inferrer) + } - def parse(source: String, environment: ProgramEnvironment): ParseResponse + private def getProgramContext(user: RawUid, environment: ProgramEnvironment): ProgramContext = { + val compilerContext = getCompilerContext(user) + new ProgramContext(environment, compilerContext) + } + + def prettyPrint(node: BaseNode, user: RawUid): String = { + SourcePrettyPrinter.format(node) + } + + def parseType(tipe: String, user: RawUid, internal: Boolean = false): ParseTypeResponse = { + val positions = new Positions() + val parser = new Antlr4SyntaxAnalyzer(positions, !internal) + parser.parseType(tipe) match { + case ParseTypeResult(errors, tipe) if errors.isEmpty => ParseTypeSuccess(tipe) + case ParseTypeResult(errors, _) => ParseTypeFailure(errors) + } + } + + def parse(source: String, environment: ProgramEnvironment): ParseResponse = { + val programContext = getProgramContext(environment.uid, environment) + try { + val positions = new Positions() + val parser = new Antlr4SyntaxAnalyzer(positions, true) + val parseResult = parser.parse(source) + if (parseResult.isSuccess) { + ParseSuccess(parseResult.tree) + } else { + ParseFailure(parseResult.errors) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } def getType( source: String, environment: ProgramEnvironment - ): GetTypeResponse + ): GetTypeResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + val tree = new TreeWithPositions(source, ensureTree = false, frontend = true)(programContext) + if (tree.valid) { + GetTypeSuccess(tree.rootType) + } else { + GetTypeFailure(tree.errors) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def getProgramDescription( + source: String, + environment: ProgramEnvironment + ): GetProgramDescriptionResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + val tree = new TreeWithPositions(source, ensureTree = false, frontend = true)(programContext) + if (tree.valid) { + val TreeDescription(decls, maybeType, comment) = tree.description + val formattedDecls = decls.map { + case (idn, programDecls) => + val formattedDecls = programDecls.map { + case TreeDeclDescription(None, outType, comment) => + DeclDescription(None, rql2TypeToRawType(outType), comment) + case TreeDeclDescription(Some(params), outType, comment) => + val formattedParams = params.map { + case TreeParamDescription(idn, tipe, required) => + ParamDescription(idn, rql2TypeToRawType(tipe), defaultValue = None, comment = None, required) + } + DeclDescription(Some(formattedParams), rql2TypeToRawType(outType), comment) + } + (idn, formattedDecls) + } + val programDescription = ProgramDescription( + formattedDecls, + maybeType.map(t => DeclDescription(None, rql2TypeToRawType(t), None)), + comment + ) + GetProgramDescriptionSuccess(programDescription) + } else { + GetProgramDescriptionFailure(tree.errors.collect { case e: ErrorMessage => e }) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def execute( + source: String, + environment: ProgramEnvironment, + maybeDecl: Option[String], + outputStream: OutputStream, + maxRows: Option[Long] + ): ExecutionResponse = { + val ctx = buildTruffleContext(environment, maybeOutputStream = Some(outputStream)) + ctx.initialize("rql") + ctx.enter() + try { + val (v, tipe) = maybeDecl match { + case Some(decl) => + // Eval the code and extract the function referred to by 'decl' + val truffleSource = Source + .newBuilder("rql", source, "unnamed") + .cached(false) // Disable code caching because of the inferrer. + .build() + ctx.eval(truffleSource) + // 'decl' is found in the context bindings (by its name) + val bindings = ctx.getBindings("rql") + val f = bindings.getMember(decl) + // its type is found in the polyglot bindings as '@type:' + val funType = { + val rawType = ctx.getPolyglotBindings.getMember("@type:" + decl).asString() + val ParseTypeSuccess(tipe: FunType) = parseType(rawType, environment.uid, internal = true) + tipe + } + // Prior to .execute, some checks on parameters since we may have + // to fill optional parameters with their default value + + // Mandatory arguments are those that don't have a matching 'name' in optional parameters + val namedArgs = funType.os.map(arg => arg.i -> arg.t).toMap + + // Split the provided parameters in two (mandatory/optional) + val (optionalArgs, mandatoryArgs) = environment.maybeArguments match { + case Some(args) => + val (optional, mandatory) = args.partition { case (idn, _) => namedArgs.contains(idn) } + (optional.map(arg => arg._1 -> arg._2).toMap, mandatory.map(_._2)) + case None => (Map.empty[String, RawValue], Array.empty[RawValue]) + } + + // Mandatory args have to be all provided + if (mandatoryArgs.length != funType.ms.size) { + return ExecutionRuntimeFailure("missing mandatory arguments") + } + val mandatoryPolyglotArguments = mandatoryArgs.map(arg => rawValueToPolyglotValue(arg, ctx)) + // Optional arguments can be missing from the provided arguments. + // We replace the missing ones by their default value. + val optionalPolyglotArguments = funType.os.map { arg => + optionalArgs.get(arg.i) match { + // if the argument is provided, use it + case Some(paramValue) => rawValueToPolyglotValue(paramValue, ctx) + // else, the argument has a default value that can be obtained from `f`. + case None => f.invokeMember("default_" + arg.i) + } + } + // All arguments are there. Call .execute. + val result = f.execute(mandatoryPolyglotArguments ++ optionalPolyglotArguments: _*) + val tipe = funType.r + // Return the result and its type. + (result, tipe) + case None => + val truffleSource = Source + .newBuilder("rql", source, "unnamed") + .cached(false) // Disable code caching because of the inferrer. + .build() + val result = ctx.eval(truffleSource) + // The value type is found in polyglot bindings after calling eval(). + val rawType = ctx.getPolyglotBindings.getMember("@type").asString() + val ParseTypeSuccess(tipe) = parseType(rawType, environment.uid, internal = true) + (result, tipe) + } + + environment.options + .get("output-format") + .map(_.toLowerCase) match { + case Some("csv") => + if (!CsvPackage.outputWriteSupport(tipe)) { + return ExecutionRuntimeFailure("unsupported type") + } + val windowsLineEnding = environment.options.get("windows-line-ending") match { + case Some("true") => true + case _ => false + } + val lineSeparator = if (windowsLineEnding) "\r\n" else "\n" + val w = new Rql2CsvWriter(outputStream, lineSeparator, maxRows) + try { + w.write(v, tipe.asInstanceOf[Rql2TypeWithProperties]) + w.flush() + ExecutionSuccess(w.complete) + } catch { + case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) + } finally { + RawUtils.withSuppressNonFatalException(w.close()) + } + case Some("json") => + if (!JsonPackage.outputWriteSupport(tipe)) { + return ExecutionRuntimeFailure("unsupported type") + } + val w = new Rql2JsonWriter(outputStream, maxRows) + try { + w.write(v, tipe.asInstanceOf[Rql2TypeWithProperties]) + w.flush() + ExecutionSuccess(w.complete) + } catch { + case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) + } finally { + RawUtils.withSuppressNonFatalException(w.close()) + } + case Some("text") => + if (!StringPackage.outputWriteSupport(tipe)) { + return ExecutionRuntimeFailure("unsupported type") + } + val w = new PolyglotTextWriter(outputStream) + try { + w.writeAndFlush(v) + ExecutionSuccess(complete = true) + } catch { + case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) + } + case Some("binary") => + if (!BinaryPackage.outputWriteSupport(tipe)) { + return ExecutionRuntimeFailure("unsupported type") + } + val w = new PolyglotBinaryWriter(outputStream) + try { + w.writeAndFlush(v) + ExecutionSuccess(complete = true) + } catch { + case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) + } + case _ => ExecutionRuntimeFailure("unknown output format") + } + } catch { + case ex: PolyglotException => + // (msb): The following are various "hacks" to ensure the inner language InterruptException propagates "out". + // Unfortunately, I do not find a more reliable alternative; the branch that does seem to work is the one + // that does startsWith. That said, I believe with Truffle, the expectation is that one is supposed to + // "cancel the context", but in our case this doesn't quite match the current architecture, where we have + // other non-Truffle languages and also, we have parts of the pipeline that are running outside of Truffle + // and which must handle interruption as well. + if (ex.isInterrupted) { + throw new InterruptedException() + } else if (ex.getCause.isInstanceOf[InterruptedException]) { + throw ex.getCause + } else if (ex.getMessage.startsWith("java.lang.InterruptedException")) { + throw new InterruptedException() + } else if (ex.isGuestException) { + if (ex.isInternalError) { + // An internal error. It means a regular Exception thrown from the language (e.g. a Java Exception, + // or a RawTruffleInternalErrorException, which isn't an AbstractTruffleException) + val programContext = getProgramContext(environment.uid, environment) + throw new CompilerServiceException(ex, programContext.dumpDebugInfo) + } else { + val err = ex.getGuestObject + if (err != null && err.hasMembers && err.hasMember("errors")) { + // A validation exception, semantic or syntax error (both come as the same kind of error) + // that has a list of errors and their positions. + val errorsValue = err.getMember("errors") + val errors = (0L until errorsValue.getArraySize).map { i => + val errorValue = errorsValue.getArrayElement(i) + val message = errorValue.asString + val positions = (0L until errorValue.getArraySize).map { j => + val posValue = errorValue.getArrayElement(j) + val beginValue = posValue.getMember("begin") + val endValue = posValue.getMember("end") + val begin = ErrorPosition(beginValue.getMember("line").asInt, beginValue.getMember("column").asInt) + val end = ErrorPosition(endValue.getMember("line").asInt, endValue.getMember("column").asInt) + ErrorRange(begin, end) + } + ErrorMessage(message, positions.to, ParserErrors.ParserErrorCode) + } + ExecutionValidationFailure(errors.to) + } else { + // A runtime failure during execution. The query could be a failed tryable, or a runtime error (e.g. a + // file not found) hit when processing a reader that evaluates as a _collection_ (processed outside the + // evaluation of the query). + ExecutionRuntimeFailure(ex.getMessage) + } + } + } else { + // Unexpected error. For now we throw the PolyglotException. + throw ex + } + } finally { + ctx.leave() + ctx.close() + } + } + + override def formatCode( + source: String, + environment: ProgramEnvironment, + maybeIndent: Option[Int], + maybeWidth: Option[Int] + ): FormatCodeResponse = { + val programContext = getProgramContext(environment.uid, environment) + try { + val pretty = new SourceCommentsPrettyPrinter(maybeIndent, maybeWidth) + pretty.prettyCode(source) match { + case Right(code) => FormatCodeResponse(Some(code)) + case Left(_) => FormatCodeResponse(None) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + + override def dotAutoComplete( + source: String, + environment: ProgramEnvironment, + position: Pos + ): AutoCompleteResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + withLspTree(source, lspService => lspService.dotAutoComplete(source, environment, position))( + programContext + ) match { + case Right(value) => value + case Left(_) => AutoCompleteResponse(Array.empty) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def wordAutoComplete( + source: String, + environment: ProgramEnvironment, + prefix: String, + position: Pos + ): AutoCompleteResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + withLspTree(source, lspService => lspService.wordAutoComplete(source, environment, prefix, position))( + programContext + ) match { + case Right(value) => value + case Left(_) => AutoCompleteResponse(Array.empty) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def hover(source: String, environment: ProgramEnvironment, position: Pos): HoverResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + withLspTree(source, lspService => lspService.hover(source, environment, position))(programContext) match { + case Right(value) => value + case Left(_) => HoverResponse(None) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def rename(source: String, environment: ProgramEnvironment, position: Pos): RenameResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + withLspTree(source, lspService => lspService.rename(source, environment, position))(programContext) match { + case Right(value) => value + case Left(_) => RenameResponse(Array.empty) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def goToDefinition( + source: String, + environment: ProgramEnvironment, + position: Pos + ): GoToDefinitionResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + withLspTree(source, lspService => lspService.definition(source, environment, position))( + programContext + ) match { + case Right(value) => value + case Left(_) => GoToDefinitionResponse(None) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def validate(source: String, environment: ProgramEnvironment): ValidateResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + try { + withLspTree( + source, + lspService => lspService.validate + )(programContext) match { + case Right(value) => value + case Left((err, pos)) => ValidateResponse(parseError(err, pos)) + } + } catch { + case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) + } + } + ) + } + + override def aiValidate(source: String, environment: ProgramEnvironment): ValidateResponse = { + withTruffleContext( + environment, + _ => { + val programContext = getProgramContext(environment.uid, environment) + // Will analyze the code and return only unknown declarations errors. + val positions = new Positions() + val parser = new Antlr4SyntaxAnalyzer(positions, true) + val parseResult = parser.parse(source) + if (parseResult.isSuccess) { + val sourceProgram = parseResult.tree + val kiamaTree = new org.bitbucket.inkytonik.kiama.relation.Tree[SourceNode, SourceProgram]( + sourceProgram + ) + val analyzer = new SemanticAnalyzer(kiamaTree)(programContext.asInstanceOf[ProgramContext]) + + // Selecting only a subset of the errors + val selection = analyzer.errors.filter { + // For the case of a function that does not exist in a package + case UnexpectedType(_, PackageType(_), ExpectedProjType(_), _, _) => true + case _: UnknownDecl => true + case _: OutputTypeRequiredForRecursiveFunction => true + case _: UnexpectedOptionalArgument => true + case _: NoOptionalArgumentsExpected => true + case _: KeyNotComparable => true + case _: ItemsNotComparable => true + case _: MandatoryArgumentAfterOptionalArgument => true + case _: RepeatedFieldNames => true + case _: UnexpectedArguments => true + case _: MandatoryArgumentsMissing => true + case _: RepeatedOptionalArguments => true + case _: PackageNotFound => true + case _: NamedParameterAfterOptionalParameter => true + case _: ExpectedTypeButGotExpression => true + case _ => false + } + ValidateResponse(formatErrors(selection, positions)) + } else { + ValidateResponse(parseResult.errors) + } + } + ) + } + + private def withLspTree[T](source: String, f: LspAnalyzer => T)( + implicit programContext: base.ProgramContext + ): Either[(String, Position), T] = { + val positions = new Positions() + val parser = new Antlr4SyntaxAnalyzer(positions, true) + val ParseProgramResult(errors, program) = parser.parse(source) + val tree = new org.bitbucket.inkytonik.kiama.relation.Tree[SourceNode, SourceProgram]( + program, + shape = LeaveAlone // The LSP parser can create "cloned nodes" so this protects it. + ) + val analyzer = new SemanticAnalyzer(tree)(programContext.asInstanceOf[ProgramContext]) + // Handle the LSP request. + val lspService = new LspAnalyzer(errors, analyzer, positions)(programContext.asInstanceOf[ProgramContext]) + Right(f(lspService)) + } + + private def parseError(error: String, position: Position): List[ErrorMessage] = { + val range = ErrorRange(ErrorPosition(position.line, position.column), ErrorPosition(position.line, position.column)) + List(ErrorMessage(error, List(range), ParserErrors.ParserErrorCode)) + } + + private def formatErrors(errors: Seq[CompilerMessage], positions: Positions): List[Message] = { + errors.map { err => + val ranges = positions.getStart(err.node) match { + case Some(begin) => + val Some(end) = positions.getFinish(err.node) + List(ErrorRange(ErrorPosition(begin.line, begin.column), ErrorPosition(end.line, end.column))) + case _ => List.empty + } + CompilationMessageMapper.toMessage(err, ranges, ErrorsPrettyPrinter.format) + }.toList + } + + override def doStop(): Unit = { + compilerContextCaches.values.foreach(compilerContext => compilerContext.inferrer.stop()) + if (initedEngine) { + CompilerService.releaseEngine + } + } + + private def rawValueToPolyglotValue(rawValue: RawValue, ctx: Context): Value = { + val code: String = rawValue match { + case RawNull() => "let x: undefined = null in x" + case RawByte(v) => s"let x: byte = ${v}b in x" + case RawShort(v) => s"let x: short = ${v}s in x" + case RawInt(v) => s"let x: int = $v in x" + case RawLong(v) => s"let x: long = ${v}L in x" + case RawFloat(v) => s"let x: float = ${v}f in x" + case RawDouble(v) => s"let x: double = $v in x" + case RawBool(v) => s"let x: bool = $v in x" + case RawString(v) => s"""let x: string = "${RawUtils.descape(v)}" in x""" + case RawDecimal(v) => s"""let x: decimal = ${v}q in x""" + case RawDate(v) => s"""let x: date = Date.Build(${v.getYear}, ${v.getMonthValue}, ${v.getDayOfMonth}) in x""" + case RawTime(v) => + s"""let x: time = Time.Build(${v.getHour}, ${v.getMinute}, millis=${v.getNano / 1000000}) in x""" + case RawTimestamp(v) => + s"""let x: timestamp = Timestamp.Build(${v.getYear}, ${v.getMonthValue}, ${v.getDayOfMonth}, ${v.getHour}, ${v.getMinute}, millis=${v.getNano / 1000000}) in x""" + case RawInterval(years, months, weeks, days, hours, minutes, seconds, millis) => + s"""let x: interval = Interval.Build(years=$years, months=$months, weeks=$weeks, days=$days, hours=$hours, minutes=$minutes, seconds=$seconds, millis=$millis) in x""" + case _ => throw new CompilerServiceException("type not supported") + } + val value = ctx.eval("rql", code) + ctx.asValue(value) + } + + private def buildTruffleContext( + environment: ProgramEnvironment, + maybeOutputStream: Option[OutputStream] = None + ): Context = { + // Add environment settings as hardcoded environment variables. + val ctxBuilder = Context + .newBuilder("rql") + .engine(engine) + .environment("RAW_PROGRAM_ENVIRONMENT", ProgramEnvironment.serializeToString(environment)) + .allowExperimentalOptions(true) + .allowPolyglotAccess(PolyglotAccess.ALL) + environment.options.get("staged-compiler").foreach { stagedCompiler => + ctxBuilder.option("rql.staged-compiler", stagedCompiler) + } + ctxBuilder.option("rql.settings", settings.renderAsString) + // If the jars path is defined, create a custom class loader and set it as the host class loader. + maybeTruffleClassLoader.map { classLoader => + // Set the module class loader as the Truffle runtime classloader. + // This enables the Truffle language runtime to be fully isolated from the rest of the application. + ctxBuilder.hostClassLoader(classLoader) + } + + maybeOutputStream.foreach(os => ctxBuilder.out(os)) + val ctx = ctxBuilder.build() + ctx + } + + private def withTruffleContext[T]( + environment: ProgramEnvironment, + f: Context => T + ): T = { + val ctx = buildTruffleContext(environment) + ctx.initialize("rql") + ctx.enter() + try { + f(ctx) + } finally { + ctx.leave() + ctx.close() + } + } } diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerServiceBuilder.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceBuilder.scala similarity index 77% rename from snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerServiceBuilder.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceBuilder.scala index a8c56ae8f..023db8cdc 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerServiceBuilder.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceBuilder.scala @@ -16,10 +16,10 @@ import com.rawlabs.compiler.CompilerServiceBuilder import com.rawlabs.compiler.CompilerService import com.rawlabs.utils.core.RawSettings -class Rql2TruffleCompilerServiceBuilder extends CompilerServiceBuilder { - override def language: Set[String] = Rql2TruffleCompilerService.LANGUAGE +class Rql2CompilerServiceBuilder extends CompilerServiceBuilder { + override def language: Set[String] = Rql2CompilerService.LANGUAGE override def build()(implicit settings: RawSettings): CompilerService = { - new Rql2TruffleCompilerService + new Rql2CompilerService } } diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala deleted file mode 100644 index ec795cfad..000000000 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2TruffleCompilerService.scala +++ /dev/null @@ -1,718 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.compiler - -import com.rawlabs.compiler.{ - AutoCompleteResponse, - CompilerService, - CompilerServiceException, - DeclDescription, - ErrorMessage, - ErrorPosition, - ErrorRange, - ExecutionResponse, - ExecutionRuntimeFailure, - ExecutionSuccess, - ExecutionValidationFailure, - FormatCodeResponse, - GetProgramDescriptionFailure, - GetProgramDescriptionResponse, - GetProgramDescriptionSuccess, - GoToDefinitionResponse, - HoverResponse, - Message, - ParamDescription, - Pos, - ProgramDescription, - ProgramEnvironment, - RawBool, - RawByte, - RawDate, - RawDecimal, - RawDouble, - RawFloat, - RawInt, - RawInterval, - RawLong, - RawNull, - RawShort, - RawString, - RawTime, - RawTimestamp, - RawValue, - RenameResponse, - ValidateResponse -} -import com.rawlabs.compiler.writers.{PolyglotBinaryWriter, PolyglotTextWriter} -import com.rawlabs.utils.core.{RawSettings, RawUid, RawUtils} -import org.bitbucket.inkytonik.kiama.relation.LeaveAlone -import org.bitbucket.inkytonik.kiama.util.{Position, Positions} -import org.graalvm.polyglot._ -import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.base.errors._ -import com.rawlabs.snapi.frontend.base.source.BaseNode -import com.rawlabs.snapi.frontend.base.{CompilerContext, TreeDeclDescription, TreeDescription, TreeParamDescription} -import com.rawlabs.snapi.frontend.common.source.{SourceNode, SourceProgram} -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult, ParseTypeResult, ParserErrors} -import com.rawlabs.snapi.frontend.rql2.builtin.{BinaryPackage, CsvPackage, JsonPackage, StringPackage} -import com.rawlabs.snapi.frontend.rql2.errors._ -import com.rawlabs.snapi.frontend.rql2.lsp.CompilerLspService -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.inferrer.api.InferrerServiceProvider - -import java.io.{IOException, OutputStream} -import scala.collection.mutable -import scala.util.control.NonFatal - -object Rql2TruffleCompilerService { - val LANGUAGE: Set[String] = Set("rql2", "rql2-truffle", "snapi") - - val JARS_PATH = "com.rawlabs.snapi.compiler.jars-path" -} - -class Rql2TruffleCompilerService(engineDefinition: (Engine, Boolean))(implicit protected val settings: RawSettings) - extends Rql2CompilerService - with CustomClassAndModuleLoader - with Rql2TypeUtils { - - private val maybeTruffleClassLoader: Option[ClassLoader] = { - // If defined, contains the path used to create a classloader for the Truffle language runtime. - val maybeJarsPath = settings.getStringOpt(Rql2TruffleCompilerService.JARS_PATH) - - // If the jars path is defined, create a custom class loader. - maybeJarsPath.map(jarsPath => createCustomClassAndModuleLoader(jarsPath)) - } - - private val (engine, initedEngine) = engineDefinition - - // The default constructor allows an Engine to be specified, plus a flag to indicate whether it was created here - // or externally. That's necessary for the test framework. - // This is actually the "default constructor" which obtains a new engine or reuses an existing one. - // Note that the engine will be released when the service is stopped only IF this auxiliary constructor created it. - // Otherwise, we expect the external party - e.g. the test framework - to close it. - // Refer to Rql2TruffleCompilerServiceTestContext to see the engine being created and released from the test - // framework, so that every test suite instance has a fresh engine. - def this()(implicit settings: RawSettings) = { - this(CompilerService.getEngine) - } - - override def language: Set[String] = Rql2TruffleCompilerService.LANGUAGE - - // Map of users to compiler context. - private val compilerContextCaches = new mutable.HashMap[RawUid, CompilerContext] - private val compilerContextCachesLock = new Object - - private def getCompilerContext(user: RawUid): CompilerContext = { - compilerContextCachesLock.synchronized { - compilerContextCaches.getOrElseUpdate(user, createCompilerContext(user, "rql2-truffle")) - } - } - - private def createCompilerContext(user: RawUid, language: String): CompilerContext = { - // Initialize inferrer - val inferrer = InferrerServiceProvider() - - // Initialize compiler context - new CompilerContext(language, user, inferrer) - } - - private def getProgramContext(user: RawUid, environment: ProgramEnvironment): ProgramContext = { - val compilerContext = getCompilerContext(user) - new Rql2ProgramContext(environment, compilerContext) - } - - override def prettyPrint(node: BaseNode, user: RawUid): String = { - SourcePrettyPrinter.format(node) - } - - override def parseType(tipe: String, user: RawUid, internal: Boolean = false): ParseTypeResponse = { - val positions = new Positions() - val parser = new Antlr4SyntaxAnalyzer(positions, !internal) - parser.parseType(tipe) match { - case ParseTypeResult(errors, tipe) if errors.isEmpty => ParseTypeSuccess(tipe) - case ParseTypeResult(errors, _) => ParseTypeFailure(errors) - } - } - - override def parse(source: String, environment: ProgramEnvironment): ParseResponse = { - val programContext = getProgramContext(environment.uid, environment) - try { - val positions = new Positions() - val parser = new Antlr4SyntaxAnalyzer(positions, true) - val parseResult = parser.parse(source) - if (parseResult.isSuccess) { - ParseSuccess(parseResult.tree) - } else { - ParseFailure(parseResult.errors) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - - override def getType( - source: String, - environment: ProgramEnvironment - ): GetTypeResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - val tree = new TreeWithPositions(source, ensureTree = false, frontend = true)(programContext) - if (tree.valid) { - GetTypeSuccess(tree.rootType) - } else { - GetTypeFailure(tree.errors) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def getProgramDescription( - source: String, - environment: ProgramEnvironment - ): GetProgramDescriptionResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - val tree = new TreeWithPositions(source, ensureTree = false, frontend = true)(programContext) - if (tree.valid) { - val TreeDescription(decls, maybeType, comment) = tree.description - val formattedDecls = decls.map { - case (idn, programDecls) => - val formattedDecls = programDecls.map { - case TreeDeclDescription(None, outType, comment) => - DeclDescription(None, rql2TypeToRawType(outType), comment) - case TreeDeclDescription(Some(params), outType, comment) => - val formattedParams = params.map { - case TreeParamDescription(idn, tipe, required) => - ParamDescription(idn, rql2TypeToRawType(tipe), defaultValue = None, comment = None, required) - } - DeclDescription(Some(formattedParams), rql2TypeToRawType(outType), comment) - } - (idn, formattedDecls) - } - val programDescription = ProgramDescription( - formattedDecls, - maybeType.map(t => DeclDescription(None, rql2TypeToRawType(t), None)), - comment - ) - GetProgramDescriptionSuccess(programDescription) - } else { - GetProgramDescriptionFailure(tree.errors.collect { case e: ErrorMessage => e }) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def execute( - source: String, - environment: ProgramEnvironment, - maybeDecl: Option[String], - outputStream: OutputStream, - maxRows: Option[Long] - ): ExecutionResponse = { - val ctx = buildTruffleContext(environment, maybeOutputStream = Some(outputStream)) - ctx.initialize("rql") - ctx.enter() - try { - val (v, tipe) = maybeDecl match { - case Some(decl) => - // Eval the code and extract the function referred to by 'decl' - val truffleSource = Source - .newBuilder("rql", source, "unnamed") - .cached(false) // Disable code caching because of the inferrer. - .build() - ctx.eval(truffleSource) - // 'decl' is found in the context bindings (by its name) - val bindings = ctx.getBindings("rql") - val f = bindings.getMember(decl) - // its type is found in the polyglot bindings as '@type:' - val funType = { - val rawType = ctx.getPolyglotBindings.getMember("@type:" + decl).asString() - val ParseTypeSuccess(tipe: FunType) = parseType(rawType, environment.uid, internal = true) - tipe - } - // Prior to .execute, some checks on parameters since we may have - // to fill optional parameters with their default value - - // mandatory arguments are those that don't have a matching 'name' in optional parameters - val namedArgs = funType.os.map(arg => arg.i -> arg.t).toMap - - // split the provided parameters in two (mandatory/optional) - val (optionalArgs, mandatoryArgs) = environment.maybeArguments match { - case Some(args) => - val (optional, mandatory) = args.partition { case (idn, _) => namedArgs.contains(idn) } - (optional.map(arg => arg._1 -> arg._2).toMap, mandatory.map(_._2)) - case None => (Map.empty[String, RawValue], Array.empty[RawValue]) - } - - // mandatory args have to be all provided - if (mandatoryArgs.length != funType.ms.size) { - return ExecutionRuntimeFailure("missing mandatory arguments") - } - val mandatoryPolyglotArguments = mandatoryArgs.map(arg => rawValueToPolyglotValue(arg, ctx)) - // optional arguments can be missing from the provided arguments. - // we replace the missing ones by their default value. - val optionalPolyglotArguments = funType.os.map { arg => - optionalArgs.get(arg.i) match { - // if the argument is provided, use it - case Some(paramValue) => rawValueToPolyglotValue(paramValue, ctx) - // else, the argument has a default value that can be obtained from `f`. - case None => f.invokeMember("default_" + arg.i) - } - } - // all arguments are there. Call .execute. - val result = f.execute(mandatoryPolyglotArguments ++ optionalPolyglotArguments: _*) - val tipe = funType.r - // return the result and its type - (result, tipe) - case None => - val truffleSource = Source - .newBuilder("rql", source, "unnamed") - .cached(false) // Disable code caching because of the inferrer. - .build() - val result = ctx.eval(truffleSource) - // the value type is found in polyglot bindings after calling eval(). - val rawType = ctx.getPolyglotBindings.getMember("@type").asString() - val ParseTypeSuccess(tipe) = parseType(rawType, environment.uid, internal = true) - (result, tipe) - } - - environment.options - .get("output-format") - .map(_.toLowerCase) match { - case Some("csv") => - if (!CsvPackage.outputWriteSupport(tipe)) { - return ExecutionRuntimeFailure("unsupported type") - } - val windowsLineEnding = environment.options.get("windows-line-ending") match { - case Some("true") => true - case _ => false - } - val lineSeparator = if (windowsLineEnding) "\r\n" else "\n" - val w = new Rql2CsvWriter(outputStream, lineSeparator, maxRows) - try { - w.write(v, tipe.asInstanceOf[Rql2TypeWithProperties]) - w.flush() - ExecutionSuccess(w.complete) - } catch { - case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) - } finally { - RawUtils.withSuppressNonFatalException(w.close()) - } - case Some("json") => - if (!JsonPackage.outputWriteSupport(tipe)) { - return ExecutionRuntimeFailure("unsupported type") - } - val w = new Rql2JsonWriter(outputStream, maxRows) - try { - w.write(v, tipe.asInstanceOf[Rql2TypeWithProperties]) - w.flush() - ExecutionSuccess(w.complete) - } catch { - case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) - } finally { - RawUtils.withSuppressNonFatalException(w.close()) - } - case Some("text") => - if (!StringPackage.outputWriteSupport(tipe)) { - return ExecutionRuntimeFailure("unsupported type") - } - val w = new PolyglotTextWriter(outputStream) - try { - w.writeAndFlush(v) - ExecutionSuccess(complete = true) - } catch { - case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) - } - case Some("binary") => - if (!BinaryPackage.outputWriteSupport(tipe)) { - return ExecutionRuntimeFailure("unsupported type") - } - val w = new PolyglotBinaryWriter(outputStream) - try { - w.writeAndFlush(v) - ExecutionSuccess(complete = true) - } catch { - case ex: IOException => ExecutionRuntimeFailure(ex.getMessage) - } - case _ => ExecutionRuntimeFailure("unknown output format") - } - } catch { - case ex: PolyglotException => - // (msb): The following are various "hacks" to ensure the inner language InterruptException propagates "out". - // Unfortunately, I do not find a more reliable alternative; the branch that does seem to work is the one - // that does startsWith. That said, I believe with Truffle, the expectation is that one is supposed to - // "cancel the context", but in our case this doesn't quite match the current architecture, where we have - // other non-Truffle languages and also, we have parts of the pipeline that are running outside of Truffle - // and which must handle interruption as well. - if (ex.isInterrupted) { - throw new InterruptedException() - } else if (ex.getCause.isInstanceOf[InterruptedException]) { - throw ex.getCause - } else if (ex.getMessage.startsWith("java.lang.InterruptedException")) { - throw new InterruptedException() - } else if (ex.isGuestException) { - if (ex.isInternalError) { - // An internal error. It means a regular Exception thrown from the language (e.g. a Java Exception, - // or a RawTruffleInternalErrorException, which isn't an AbstractTruffleException) - val programContext = getProgramContext(environment.uid, environment) - throw new CompilerServiceException(ex, programContext.dumpDebugInfo) - } else { - val err = ex.getGuestObject - if (err != null && err.hasMembers && err.hasMember("errors")) { - // A validation exception, semantic or syntax error (both come as the same kind of error) - // that has a list of errors and their positions. - val errorsValue = err.getMember("errors") - val errors = (0L until errorsValue.getArraySize).map { i => - val errorValue = errorsValue.getArrayElement(i) - val message = errorValue.asString - val positions = (0L until errorValue.getArraySize).map { j => - val posValue = errorValue.getArrayElement(j) - val beginValue = posValue.getMember("begin") - val endValue = posValue.getMember("end") - val begin = ErrorPosition(beginValue.getMember("line").asInt, beginValue.getMember("column").asInt) - val end = ErrorPosition(endValue.getMember("line").asInt, endValue.getMember("column").asInt) - ErrorRange(begin, end) - } - ErrorMessage(message, positions.to, ParserErrors.ParserErrorCode) - } - ExecutionValidationFailure(errors.to) - } else { - // A runtime failure during execution. The query could be a failed tryable, or a runtime error (e.g. a - // file not found) hit when processing a reader that evaluates as a _collection_ (processed outside the - // evaluation of the query). - ExecutionRuntimeFailure(ex.getMessage) - } - } - } else { - // Unexpected error. For now we throw the PolyglotException. - throw ex - } - } finally { - ctx.leave() - ctx.close() - } - } - - override def formatCode( - source: String, - environment: ProgramEnvironment, - maybeIndent: Option[Int], - maybeWidth: Option[Int] - ): FormatCodeResponse = { - val programContext = getProgramContext(environment.uid, environment) - try { - val pretty = new SourceCommentsPrettyPrinter(maybeIndent, maybeWidth) - pretty.prettyCode(source) match { - case Right(code) => FormatCodeResponse(Some(code)) - case Left(_) => FormatCodeResponse(None) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - - override def dotAutoComplete( - source: String, - environment: ProgramEnvironment, - position: Pos - ): AutoCompleteResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - withLspTree(source, lspService => lspService.dotAutoComplete(source, environment, position))( - programContext - ) match { - case Right(value) => value - case Left(_) => AutoCompleteResponse(Array.empty) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def wordAutoComplete( - source: String, - environment: ProgramEnvironment, - prefix: String, - position: Pos - ): AutoCompleteResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - withLspTree(source, lspService => lspService.wordAutoComplete(source, environment, prefix, position))( - programContext - ) match { - case Right(value) => value - case Left(_) => AutoCompleteResponse(Array.empty) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def hover(source: String, environment: ProgramEnvironment, position: Pos): HoverResponse = { - /* - withLspTree(source, lspService => lspService.hover(source, environment, position)) match { - case Right(value) => value - case Left((err, pos)) => HoverResponse(None, parseError(err, pos)) - } - */ - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - withLspTree(source, lspService => lspService.hover(source, environment, position))(programContext) match { - case Right(value) => value - case Left(_) => HoverResponse(None) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def rename(source: String, environment: ProgramEnvironment, position: Pos): RenameResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - withLspTree(source, lspService => lspService.rename(source, environment, position))(programContext) match { - case Right(value) => value - case Left(_) => RenameResponse(Array.empty) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def goToDefinition( - source: String, - environment: ProgramEnvironment, - position: Pos - ): GoToDefinitionResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - withLspTree(source, lspService => lspService.definition(source, environment, position))( - programContext - ) match { - case Right(value) => value - case Left(_) => GoToDefinitionResponse(None) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def validate(source: String, environment: ProgramEnvironment): ValidateResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - try { - withLspTree( - source, - lspService => lspService.validate - )(programContext) match { - case Right(value) => value - case Left((err, pos)) => ValidateResponse(parseError(err, pos)) - } - } catch { - case NonFatal(t) => throw new CompilerServiceException(t, programContext.dumpDebugInfo) - } - } - ) - } - - override def aiValidate(source: String, environment: ProgramEnvironment): ValidateResponse = { - withTruffleContext( - environment, - _ => { - val programContext = getProgramContext(environment.uid, environment) - // Will analyze the code and return only unknown declarations errors. - val positions = new Positions() - val parser = new Antlr4SyntaxAnalyzer(positions, true) - val parseResult = parser.parse(source) - if (parseResult.isSuccess) { - val sourceProgram = parseResult.tree - val kiamaTree = new org.bitbucket.inkytonik.kiama.relation.Tree[SourceNode, SourceProgram]( - sourceProgram - ) - val analyzer = new SemanticAnalyzer(kiamaTree)(programContext.asInstanceOf[ProgramContext]) - - // Selecting only a subset of the errors - val selection = analyzer.errors.filter { - // For the case of a function that does not exist in a package - case UnexpectedType(_, PackageType(_), ExpectedProjType(_), _, _) => true - case _: UnknownDecl => true - case _: OutputTypeRequiredForRecursiveFunction => true - case _: UnexpectedOptionalArgument => true - case _: NoOptionalArgumentsExpected => true - case _: KeyNotComparable => true - case _: ItemsNotComparable => true - case _: MandatoryArgumentAfterOptionalArgument => true - case _: RepeatedFieldNames => true - case _: UnexpectedArguments => true - case _: MandatoryArgumentsMissing => true - case _: RepeatedOptionalArguments => true - case _: PackageNotFound => true - case _: NamedParameterAfterOptionalParameter => true - case _: ExpectedTypeButGotExpression => true - case _ => false - } - ValidateResponse(formatErrors(selection, positions)) - } else { - ValidateResponse(parseResult.errors) - } - } - ) - } - - private def withLspTree[T](source: String, f: CompilerLspService => T)( - implicit programContext: base.ProgramContext - ): Either[(String, Position), T] = { - val positions = new Positions() - val parser = new Antlr4SyntaxAnalyzer(positions, true) - val ParseProgramResult(errors, program) = parser.parse(source) - val tree = new org.bitbucket.inkytonik.kiama.relation.Tree[SourceNode, SourceProgram]( - program, - shape = LeaveAlone // The LSP parser can create "cloned nodes" so this protects it. - ) - val analyzer = new SemanticAnalyzer(tree)(programContext.asInstanceOf[ProgramContext]) - // Handle the LSP request. - val lspService = new CompilerLspService(errors, analyzer, positions)(programContext.asInstanceOf[ProgramContext]) - Right(f(lspService)) - } - - private def parseError(error: String, position: Position): List[ErrorMessage] = { - val range = ErrorRange(ErrorPosition(position.line, position.column), ErrorPosition(position.line, position.column)) - List(ErrorMessage(error, List(range), ParserErrors.ParserErrorCode)) - } - - private def formatErrors(errors: Seq[CompilerMessage], positions: Positions): List[Message] = { - errors.map { err => - val ranges = positions.getStart(err.node) match { - case Some(begin) => - val Some(end) = positions.getFinish(err.node) - List(ErrorRange(ErrorPosition(begin.line, begin.column), ErrorPosition(end.line, end.column))) - case _ => List.empty - } - CompilationMessageMapper.toMessage(err, ranges, ErrorsPrettyPrinter.format) - }.toList - } - - override def doStop(): Unit = { - compilerContextCaches.values.foreach(compilerContext => compilerContext.inferrer.stop()) - if (initedEngine) { - CompilerService.releaseEngine - } - } - - private def rawValueToPolyglotValue(rawValue: RawValue, ctx: Context): Value = { - val code: String = rawValue match { - case RawNull() => "let x: undefined = null in x" - case RawByte(v) => s"let x: byte = ${v}b in x" - case RawShort(v) => s"let x: short = ${v}s in x" - case RawInt(v) => s"let x: int = $v in x" - case RawLong(v) => s"let x: long = ${v}L in x" - case RawFloat(v) => s"let x: float = ${v}f in x" - case RawDouble(v) => s"let x: double = $v in x" - case RawBool(v) => s"let x: bool = $v in x" - case RawString(v) => s"""let x: string = "${RawUtils.descape(v)}" in x""" - case RawDecimal(v) => s"""let x: decimal = ${v}q in x""" - case RawDate(v) => s"""let x: date = Date.Build(${v.getYear}, ${v.getMonthValue}, ${v.getDayOfMonth}) in x""" - case RawTime(v) => - s"""let x: time = Time.Build(${v.getHour}, ${v.getMinute}, millis=${v.getNano / 1000000}) in x""" - case RawTimestamp(v) => - s"""let x: timestamp = Timestamp.Build(${v.getYear}, ${v.getMonthValue}, ${v.getDayOfMonth}, ${v.getHour}, ${v.getMinute}, millis=${v.getNano / 1000000}) in x""" - case RawInterval(years, months, weeks, days, hours, minutes, seconds, millis) => - s"""let x: interval = Interval.Build(years=$years, months=$months, weeks=$weeks, days=$days, hours=$hours, minutes=$minutes, seconds=$seconds, millis=$millis) in x""" - case _ => throw new CompilerServiceException("type not supported") - } - val value = ctx.eval("rql", code) - ctx.asValue(value) - } - - private def buildTruffleContext( - environment: ProgramEnvironment, - maybeOutputStream: Option[OutputStream] = None - ): Context = { - // Add environment settings as hardcoded environment variables. - val ctxBuilder = Context - .newBuilder("rql") - .engine(engine) - .environment("RAW_PROGRAM_ENVIRONMENT", ProgramEnvironment.serializeToString(environment)) - .allowExperimentalOptions(true) - .allowPolyglotAccess(PolyglotAccess.ALL) - environment.options.get("staged-compiler").foreach { stagedCompiler => - ctxBuilder.option("rql.staged-compiler", stagedCompiler) - } - ctxBuilder.option("rql.settings", settings.renderAsString) - // If the jars path is defined, create a custom class loader and set it as the host class loader. - maybeTruffleClassLoader.map { classLoader => - // Set the module class loader as the Truffle runtime classloader. - // This enables the Truffle language runtime to be fully isolated from the rest of the application. - ctxBuilder.hostClassLoader(classLoader) - } - - maybeOutputStream.foreach(os => ctxBuilder.out(os)) - val ctx = ctxBuilder.build() - ctx - } - - private def withTruffleContext[T]( - environment: ProgramEnvironment, - f: Context => T - ): T = { - val ctx = buildTruffleContext(environment) - ctx.initialize("rql") - ctx.enter() - try { - f(ctx) - } finally { - ctx.leave() - ctx.close() - } - } - -} diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala index 475ed8679..9535be11c 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.compiler +package com.rawlabs.snapi.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonParser} import com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala index 5b11f9bc2..563852cbb 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.compiler +package com.rawlabs.snapi.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonParser} import com.rawlabs.compiler.utils.RecordFieldsNaming diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerServiceTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceTestContext.scala similarity index 90% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerServiceTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceTestContext.scala index e87a956cc..21df4c0e5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerServiceTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceTestContext.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.compiler.truffle +package com.rawlabs.snapi.compiler +import com.rawlabs.compiler.CompilerServiceTestContext import com.rawlabs.utils.core.{RawTestSuite, RawUtils, SettingsTestContext} import org.graalvm.polyglot.Engine -import com.rawlabs.snapi.compiler.{Rql2CompilerServiceTestContext, Rql2TruffleCompilerService} -trait Rql2TruffleCompilerServiceTestContext extends Rql2CompilerServiceTestContext { +trait Rql2CompilerServiceTestContext extends CompilerServiceTestContext { this: RawTestSuite with SettingsTestContext => - var rql2TruffleCompilerService: Rql2TruffleCompilerService = _ + var rql2TruffleCompilerService: Rql2CompilerService = _ var engine: Engine = _ @@ -75,7 +75,7 @@ trait Rql2TruffleCompilerServiceTestContext extends Rql2CompilerServiceTestConte .options(options) .build() - rql2TruffleCompilerService = new Rql2TruffleCompilerService((engine, false)) + rql2TruffleCompilerService = new Rql2CompilerService((engine, false)) setCompilerService(rql2TruffleCompilerService) } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2OutputTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2OutputTestContext.scala similarity index 100% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2OutputTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2OutputTestContext.scala index dedf5b54e..9d975cdd7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/api/Rql2OutputTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2OutputTestContext.scala @@ -17,11 +17,11 @@ import com.fasterxml.jackson.core.json.JsonReadFeature import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule} import com.google.common.collect.HashMultiset -import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} -import org.bitbucket.inkytonik.kiama.util.Positions import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzer import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} +import org.bitbucket.inkytonik.kiama.util.Positions import java.nio.file.Path import scala.collection.JavaConverters._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2CompilerTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2TestContext.scala similarity index 99% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2CompilerTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2TestContext.scala index 46a1e2f1b..e465aded5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2CompilerTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2TestContext.scala @@ -14,6 +14,7 @@ package com.rawlabs.snapi.compiler.tests import com.rawlabs.compiler.{ AutoCompleteResponse, + CompilerServiceTestContext, ExecutionRuntimeFailure, ExecutionSuccess, ExecutionValidationFailure, @@ -55,7 +56,7 @@ import com.rawlabs.protocol.compiler.{ SnowflakeConfig } import com.rawlabs.utils.core._ -import com.rawlabs.snapi.compiler.{Rql2CompilerServiceTestContext, Rql2OutputTestContext} +import com.rawlabs.snapi.compiler.Rql2OutputTestContext import java.io.{ByteArrayOutputStream, FileWriter} import java.nio.charset.{Charset, StandardCharsets} @@ -198,15 +199,14 @@ object TestCredentials { } -trait Rql2CompilerTestContext +trait Rql2TestContext extends RawTestSuite with Matchers with SettingsTestContext with TrainingWheelsContext - with Rql2CompilerServiceTestContext + with CompilerServiceTestContext with Rql2OutputTestContext - - // Simple inferrer + with Rql2CompilerServiceTestContext with LocalInferrerTestContext { private val secrets = new mutable.HashMap[String, String]() @@ -215,6 +215,8 @@ trait Rql2CompilerTestContext protected val programOptions = new mutable.HashMap[String, String]() + override def compilerService: Rql2CompilerService = super.compilerService.asInstanceOf[Rql2CompilerService] + def authorizedUser: RawUid = RawUid("janeUid") def runnerScopes: Set[String] = Set.empty diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala index 1aa73cdef..9d94e8e57 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.benchmark -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BenchmarkTests extends Rql2TruffleCompilerTestContext { +class BenchmarkTests extends Rql2TestContext { property("raw.training-wheels", "false") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala index b4a447b1f..2aa48a9e5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.benchmark -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class StressTests extends Rql2TruffleCompilerTestContext { +class StressTests extends Rql2TestContext { val shouldBeExecuted = false diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala index 71d060e83..a7121b021 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Path import java.util.Base64 -class BinaryPackageTest extends Rql2TruffleCompilerTestContext { +class BinaryPackageTest extends Rql2TestContext { // FIXME (msb): This should use cast to support string to binary and do .getBytes("utf-8") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala index dff1b06e8..5e293144b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BytePackageTest extends Rql2TruffleCompilerTestContext { +class BytePackageTest extends Rql2TestContext { test(""" Byte.From(1)""")(it => it should evaluateTo("1b")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala index ab6314d2a..70566075d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class CsvPackageTest extends Rql2TruffleCompilerTestContext { +class CsvPackageTest extends Rql2TestContext { val ttt = "\"\"\"" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala index 621b4d8a5..0de73c359 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class DatePackageTest extends Rql2TruffleCompilerTestContext { +class DatePackageTest extends Rql2TestContext { test("Date.Build(2022, 1, 15)") { it => it should typeAs("date") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala index 964caa193..313444a29 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class DecimalPackageTest extends Rql2TruffleCompilerTestContext { +class DecimalPackageTest extends Rql2TestContext { test("""Decimal.Round(Decimal.From("1.423"), 2)""") { it => it should evaluateTo("""1.42q""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala index ddfde8f89..2cbb61446 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class DoublePackageTest extends Rql2TruffleCompilerTestContext { +class DoublePackageTest extends Rql2TestContext { test(""" Double.From(1)""")(it => it should evaluateTo("1.0")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala index ab438af35..b27d66f48 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala @@ -13,11 +13,11 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.google.common.collect.HashMultiset -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import scala.collection.JavaConverters._ -class EnvironmentPackageTest extends Rql2TruffleCompilerTestContext { +class EnvironmentPackageTest extends Rql2TestContext { test("""Environment.Secret("my-typo")""")(it => it should runErrorAs("unknown secret: my-typo")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala index 8aa1aa945..055938239 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ErrorPackageTest extends Rql2TruffleCompilerTestContext { +class ErrorPackageTest extends Rql2TestContext { test(""" Error.Build("an error")""")(it => it should runErrorAs("an error")) test(""" Error.Build("an error") == Error.Build("an error")""")(it => it should runErrorAs("an error")) test(""" Error.Build("an error") == Error.Build("another error")""")(it => it should runErrorAs("an error")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala index 54e155bf1..eb857b3ef 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class FloatPackageTest extends Rql2TruffleCompilerTestContext { +class FloatPackageTest extends Rql2TestContext { test(""" Float.From(1)""")(it => it should evaluateTo("1.0f")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala index e48ce7b9b..ed25ede75 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class FunctionPackageTest extends Rql2TruffleCompilerTestContext { +class FunctionPackageTest extends Rql2TestContext { test("""Function.InvokeAfter(() -> 1 +1, 10)""".stripMargin)(_ should evaluateTo("2")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala index c38a1a5bd..179be81d4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala @@ -14,12 +14,12 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.sun.net.httpserver.{BasicAuthenticator, HttpExchange, HttpServer} import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.net.InetSocketAddress import scala.collection.JavaConverters._ -class HttpPackageTest extends Rql2TruffleCompilerTestContext { +class HttpPackageTest extends Rql2TestContext { val expectedUser = "user" val expectedPassword = "passwd" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala index 395cadc89..fec46f778 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class IntPackageTest extends Rql2TruffleCompilerTestContext { +class IntPackageTest extends Rql2TestContext { test(""" Int.From(1)""")(it => it should evaluateTo("1")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala index 3eed5aea8..15df90470 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class IntervalPackageTest extends Rql2TruffleCompilerTestContext { +class IntervalPackageTest extends Rql2TestContext { test("Interval.Build(months=12) == Interval.Build(years=1)")(_ should evaluateTo("true")) test("Interval.Build(hours=24) == Interval.Build(days=1)")(_ should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala index a3e73d21a..17a67e01a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class JsonPackageTest extends Rql2TruffleCompilerTestContext { +class JsonPackageTest extends Rql2TestContext { private val junkAfter10Items = tempFile("""[ | {"a": 1, "b": "#1", "c": 1.1}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala index da307400f..24c146e0b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import java.nio.file.Path -class LocationPackageTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class LocationPackageTest extends Rql2TestContext with LocalLocationsTestContext { test(s""" |let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala index 0eb68d848..9aab40266 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LongPackageTest extends Rql2TruffleCompilerTestContext { +class LongPackageTest extends Rql2TestContext { test(""" Long.From(1)""")(it => it should evaluateTo("1L")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala index d7eb0d55e..ed1420466 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class MathPackageTest extends Rql2TruffleCompilerTestContext { +class MathPackageTest extends Rql2TestContext { // Nullable - Tryable tests test("""Math.Sin(if(true) then 3.13 else null)""")(_ should beCloseTo("0.011592393936158275")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala index 2a43d881b..e2a08e94e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class NullablePackageTest extends Rql2TruffleCompilerTestContext { +class NullablePackageTest extends Rql2TestContext { test("""Nullable.IsNull(null)""")(_ should evaluateTo("true")) test("""Nullable.IsNull(1)""")(_ should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala index 44d52ce0a..ac581a45c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class NullableTryablePackageTest extends Rql2TruffleCompilerTestContext { +class NullableTryablePackageTest extends Rql2TestContext { test("""1 / null""")(_ should evaluateTo("null")) test(""" 1.0 / (if true then null else 2)""")(_ should evaluateTo("null")) test(""" 1.0 / (if false then null else 2)""")(_ should evaluateTo("0.5")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala index c8d095feb..4cc1ff7c9 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RecordPackageTest extends Rql2TruffleCompilerTestContext { +class RecordPackageTest extends Rql2TestContext { test("""Record.Build(a = 1, b = "Hello")""".stripMargin)(_ should (typeAs("record(a: int, b: string)") and run)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala index 1b8bc890d..bf8c7eb80 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RegexPackageTest extends Rql2TruffleCompilerTestContext { +class RegexPackageTest extends Rql2TestContext { test("""Regex.Replace("Heelloo John", "[aeiou]+", "_")""")(it => it should evaluateTo(""" "H_ll_ J_hn" """)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala index bec896f97..88a97b7fc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class S3PackageTest extends Rql2TruffleCompilerTestContext { +class S3PackageTest extends Rql2TestContext { import com.rawlabs.snapi.compiler.tests.TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala index d956e484c..33b6561c1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ShortPackageTest extends Rql2TruffleCompilerTestContext { +class ShortPackageTest extends Rql2TestContext { test(""" Short.From(1)""")(it => it should evaluateTo("1s")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala index 19637fef3..1a5ed0ed4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala @@ -13,13 +13,13 @@ package com.rawlabs.snapi.compiler.tests.builtin import java.util.Base64 -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.compiler.tests.FailAfterNServer -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Path -class StringPackageTest extends Rql2TruffleCompilerTestContext with FailAfterNServer { +class StringPackageTest extends Rql2TestContext with FailAfterNServer { // Each line has 11 bytes so it will fail at line 10 more or less. override def failServices: Seq[FailAfter] = Seq( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala index 6119cf8f9..9b32affc8 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class SuccessPackageTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class SuccessPackageTest extends Rql2TestContext with TableDrivenPropertyChecks { test("Success.Build(1)")(_ should evaluateTo("1")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala index f13de3b00..8d31f0842 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class TimePackageTest extends Rql2TruffleCompilerTestContext { +class TimePackageTest extends Rql2TestContext { test("Time.Build(9, 30)") { it => it should typeAs("time") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala index 3823de74a..a08c065a3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class TimestampPackageTest extends Rql2TruffleCompilerTestContext { +class TimestampPackageTest extends Rql2TestContext { test("Timestamp.Build(2022, 1, 15, 9, 30)") { it => it should typeAs("timestamp") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala index 404b0b7e7..222cfd330 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class TryPackageTest extends Rql2TruffleCompilerTestContext { +class TryPackageTest extends Rql2TestContext { test("""Try.IsError("hi")""")(_ should evaluateTo("false")) test("""Try.IsError(1)""")(_ should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala index 0886ac2e2..2d9c1cbd7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class TypePackageTest extends Rql2TruffleCompilerTestContext { +class TypePackageTest extends Rql2TestContext { ignore("""Types.Merge(int, float)""")(it => it should typeAs("float")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala index e6b75de10..45c2a9dfd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class XmlPackageTest extends Rql2TruffleCompilerTestContext { +class XmlPackageTest extends Rql2TestContext { private val allTypes = tempFile(""" | 120 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala index 665400d64..63c80b37a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class CollectionDistinctTest extends Rql2TruffleCompilerTestContext { +class CollectionDistinctTest extends Rql2TestContext { test("""let numbers = Collection.From([5, 2, 4, 2, 2, 4, 5]) |in Collection.Distinct(numbers)""".stripMargin)(_ should evaluateTo("[2, 4, 5]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala index 007781069..f129eb9ee 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionExplodeTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionExplodeTest extends Rql2TestContext with LocalLocationsTestContext { private val nba = tempFile("""[ | {"team": {"name": "Bulls", "city": "Chicago"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala index 881aa3c86..466f168bd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionGroupByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionGroupByTest extends Rql2TestContext with LocalLocationsTestContext { private val lineitemType = """record( | l_orderkey: int, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala index 189af2014..3bad916f4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionJoinTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionJoinTest extends Rql2TestContext with LocalLocationsTestContext { test(snapi"""let regions = Csv.InferAndRead("$tpchRegionCsvLocal"), | nations = Csv.InferAndRead("$tpchNationCsvLocal") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala index cce6aaf9c..b8992c0ac 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class CollectionMinMaxTest extends Rql2TruffleCompilerTestContext { +class CollectionMinMaxTest extends Rql2TestContext { // Date test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala index 58ac580fa..11e40ba89 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class CollectionMkStringTest extends Rql2TruffleCompilerTestContext { +class CollectionMkStringTest extends Rql2TestContext { test("""let items = Collection.Build() |in Collection.MkString(items, sep="|")""".stripMargin)(_ should evaluateTo(""" "" """)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala index ce6afe9b4..74dc3aa0d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.{InvalidOrderSpec, KeyNotComparable, OrderSpecMustFollowOrderingFunction} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionOrderByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionOrderByTest extends Rql2TestContext with LocalLocationsTestContext { private val coolBandsWithoutHeader = tempFile("""Bee Gees|Maurice|Gibb|1949 |Bee Gees|Robin|Gibb|1949 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala index 7cdf807f1..9d428cbcb 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Path -class CollectionPackageTest extends Rql2TruffleCompilerTestContext { +class CollectionPackageTest extends Rql2TestContext { // a test to check if there are multiple instances of generators test("""let a = Collection.Build(1,2,3), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala index 82dc1dc0c..43be5804e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class CollectionRangeTest extends Rql2TruffleCompilerTestContext { +class CollectionRangeTest extends Rql2TestContext { // Long.Range diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala index 6792dbfd1..65877eb7a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionUnionTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class CollectionUnionTest extends Rql2TestContext with LocalLocationsTestContext { test("Collection.Union(Collection.Build(1,2,3), Collection.Build(4,5,6))")(_ should evaluateTo("[1,2,3,4,5,6]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala index c456ae1a7..5a3bc6950 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class AwsPackageTest extends Rql2TruffleCompilerTestContext { +class AwsPackageTest extends Rql2TestContext { val accessKeyId = sys.env("RAW_AWS_ACCESS_KEY_ID") val secretAccessKey = sys.env("RAW_AWS_SECRET_ACCESS_KEY") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala index f4849d0fc..bef9a0360 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class EnvironmentPackageTest extends Rql2TruffleCompilerTestContext { +class EnvironmentPackageTest extends Rql2TestContext { secret("my-secret", "my-secret-value") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala index 632d63a6f..995dfb367 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LocationPackageTest extends Rql2TruffleCompilerTestContext { +class LocationPackageTest extends Rql2TestContext { import com.rawlabs.snapi.compiler.tests.TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala index 5354b7ca0..a4965f877 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class MySQLPackageTest extends Rql2TruffleCompilerTestContext { +class MySQLPackageTest extends Rql2TestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala index 24dac09be..13a17baa9 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class OraclePackageTest extends Rql2TruffleCompilerTestContext { +class OraclePackageTest extends Rql2TestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala index 7217e36cc..42dbe6919 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class PostgreSQLPackageTest extends Rql2TruffleCompilerTestContext { +class PostgreSQLPackageTest extends Rql2TestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala index f46dd97ef..ae3159e8b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class S3PackageTest extends Rql2TruffleCompilerTestContext { +class S3PackageTest extends Rql2TestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala index 9e3b99b60..420517148 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class SQLServerPackageTest extends Rql2TruffleCompilerTestContext { +class SQLServerPackageTest extends Rql2TestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala index fb92d9638..b811db0db 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class SnowflakePackageTest extends Rql2TruffleCompilerTestContext { +class SnowflakePackageTest extends Rql2TestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala index 375270ca9..227dc5fb9 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.list import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ListDistinctTest extends Rql2TruffleCompilerTestContext { +class ListDistinctTest extends Rql2TestContext { test("""let numbers = [5, 2, 4, 2, 2, 4, 5] |in List.Distinct(numbers)""".stripMargin)(_ should evaluateTo("[2, 4, 5]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala index 60c62a2d9..e4cdedbcd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListExplodeTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListExplodeTest extends Rql2TestContext with LocalLocationsTestContext { private val nba = tempFile("""[ | {"team": {"name": "Bulls", "city": "Chicago"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala index 8658126ae..0ae654283 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListGroupByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListGroupByTest extends Rql2TestContext with LocalLocationsTestContext { private val lineitemType = """record( | l_orderkey: int, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala index c1e4aebea..0988d6295 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListJoinTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListJoinTest extends Rql2TestContext with LocalLocationsTestContext { private val listOfCountries = """[ | {region: "AFRICA", nation: "ALGERIA"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala index 690af7c7e..c1c3e1ed0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.list import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ListMinMaxTest extends Rql2TruffleCompilerTestContext { +class ListMinMaxTest extends Rql2TestContext { // Date test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala index d407dc9dd..0ff1d6b25 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ListMkStringTest extends Rql2TruffleCompilerTestContext { +class ListMkStringTest extends Rql2TestContext { test("""let items = List.Build() |in List.MkString(items, sep="|")""".stripMargin)(_ should evaluateTo(""" "" """)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala index 56038b807..8d4b79334 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.{InvalidOrderSpec, KeyNotComparable} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListOrderByTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListOrderByTest extends Rql2TestContext with LocalLocationsTestContext { // using String.ReadLines test(snapi"""let regions = List.From(Collection.Transform( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala index ecc7902cc..ef205fee8 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Path -class ListPackageTest extends Rql2TruffleCompilerTestContext { +class ListPackageTest extends Rql2TestContext { test("""["Hello", Error.Build("Argh!!"), null]""") { _ should evaluateTo("""["Hello", Error.Build("Argh!!"), null]""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala index 045a4a0bb..f1fedddfc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListUnionTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class ListUnionTest extends Rql2TestContext with LocalLocationsTestContext { test("List.Union([1,2,3], [4,5,6])")(_ should evaluateTo("[1,2,3,4,5,6]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala index 390e7004a..69a6b3a2c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.hints -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class SemanticAnalyzerHintsTest extends Rql2TruffleCompilerTestContext { +class SemanticAnalyzerHintsTest extends Rql2TestContext { test("""Rekord.Build(a=1)""")(it => it should typeErrorAs("did you mean Record.Build?")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala index 14669d8be..6f6140448 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.ValidateResponse import com.rawlabs.snapi.frontend.rql2.errors.OutputTypeRequiredForRecursiveFunction -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspAiValidateTest extends Rql2TruffleCompilerTestContext { +class LspAiValidateTest extends Rql2TestContext { test("AI validate package that does not exist") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala index e35c6b23d..d8d99468c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{HoverResponse, Pos, TypeCompletion} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspBrokenCodeTest extends Rql2TruffleCompilerTestContext { +class LspBrokenCodeTest extends Rql2TestContext { test("broken code hover test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala index 877eb423a..e9d28e0b1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.FormatCodeResponse -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspCommentsFormatTest extends Rql2TruffleCompilerTestContext { +class LspCommentsFormatTest extends Rql2TestContext { def assertFormattedCode( code: String, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala index 5f9b66f03..8cfee964e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala @@ -14,8 +14,8 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{ErrorMessage, WarningMessage} import com.rawlabs.snapi.frontend.base.errors.{MissingSecretWarning, UnknownDecl} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -class LspCompilationMessagesTest extends Rql2TruffleCompilerTestContext { +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +class LspCompilationMessagesTest extends Rql2TestContext { test("should return a waning") { _ => val code = """let a = Environment.Secret("a") in a""".stripMargin diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala index c1d7a5b20..63536740b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{GoToDefinitionResponse, Pos} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspDefinitionTest extends Rql2TruffleCompilerTestContext { +class LspDefinitionTest extends Rql2TestContext { test("go to definition identifier at usage test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala index 5efc38ac5..fc83df065 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{AutoCompleteResponse, FieldCompletion, PackageEntryCompletion, Pos} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspDotAutoCompleteTest extends Rql2TruffleCompilerTestContext { +class LspDotAutoCompleteTest extends Rql2TestContext { private def dotAutoCompleteTest(code: String, line: Int, col: Int, expectedFields: Seq[(String, String)]): Unit = { val AutoCompleteResponse(entries) = dotAutoComplete(code, Pos(line, col)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala index 70b82bfe9..e9572d1d7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.FormatCodeResponse -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspFormatCodeTest extends Rql2TruffleCompilerTestContext { +class LspFormatCodeTest extends Rql2TestContext { def assertFormattedCode(code: String, expected: String) = { val FormatCodeResponse(Some(formattedCode)) = formatCode(code) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala index 5f15b5215..ae07b4c54 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{HoverResponse, PackageCompletion, PackageEntryCompletion, Pos, TypeCompletion} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspHoverTest extends Rql2TruffleCompilerTestContext { +class LspHoverTest extends Rql2TestContext { test("hover identifier at definition test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala index 91e9c537b..1e7c39473 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{Pos, RenameResponse} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspRenameTest extends Rql2TruffleCompilerTestContext { +class LspRenameTest extends Rql2TestContext { test("rename identifier at usage test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala index 04db951ef..a954c1ae0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.ValidateResponse -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspValidateTest extends Rql2TruffleCompilerTestContext { +class LspValidateTest extends Rql2TestContext { test("validate simple code test") { _ => val code = """String.Lower("Hello")""".stripMargin diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala index 8d01c7309..d6ec94036 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala @@ -24,9 +24,9 @@ import com.rawlabs.compiler.{ Pos, TypeCompletion } -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspWordAutoCompleteTest extends Rql2TruffleCompilerTestContext { +class LspWordAutoCompleteTest extends Rql2TestContext { private lazy val allTypes = Seq( ("byte", Some("")), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala index 70c20f674..949ed45d2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.offheap import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class KryoPackageTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class KryoPackageTest extends Rql2TestContext with TableDrivenPropertyChecks { private val cases = Table( ("value", "type"), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala index 09617db9a..3f1c5fdb3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -trait OffHeapDatasets { this: Rql2TruffleCompilerTestContext => +trait OffHeapDatasets { this: Rql2TestContext => protected val N = 100 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala index 264ba087c..8c13b3292 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class OffHeapDistinctTest extends Rql2TruffleCompilerTestContext { +class OffHeapDistinctTest extends Rql2TestContext { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "30kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala index ab21cf9d2..1251072af 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ -class OffHeapEquiJoinTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapEquiJoinTest extends Rql2TestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala index acfd9b122..695367e70 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ -class OffHeapGroupTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapGroupTest extends Rql2TestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala index 8e273b328..960b0ed39 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ -class OffHeapJoinTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapJoinTest extends Rql2TestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala index 3c17e44bd..7a22b5422 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ -class OffHeapOrderByTest extends Rql2TruffleCompilerTestContext with OffHeapDatasets { +class OffHeapOrderByTest extends Rql2TestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala index 0d6647ee1..b78565041 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala @@ -13,13 +13,13 @@ package com.rawlabs.snapi.compiler.tests.output import org.apache.commons.io.FileUtils -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import java.io.File import java.nio.file.Files -class BinaryOutputTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class BinaryOutputTest extends Rql2TestContext with LocalLocationsTestContext { option("output-format", "binary") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala index a91f93b7a..af72266d4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala @@ -13,13 +13,13 @@ package com.rawlabs.snapi.compiler.tests.output import com.rawlabs.utils.core.RawUtils -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.utils.core._ import java.nio.file.Files -class CsvOutputTest extends Rql2TruffleCompilerTestContext { +class CsvOutputTest extends Rql2TestContext { option("output-format", "csv") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala index 247ac3650..40ac451e1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala @@ -13,12 +13,12 @@ package com.rawlabs.snapi.compiler.tests.output import com.rawlabs.utils.core.RawUtils -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.core._ import java.nio.file.{Files, Path} -class JsonOutputTest extends Rql2TruffleCompilerTestContext { +class JsonOutputTest extends Rql2TestContext { option("output-format", "json") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala index 837c0e194..ca356c79c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.output -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Files -class TextOutputTest extends Rql2TruffleCompilerTestContext { +class TextOutputTest extends Rql2TestContext { option("output-format", "text") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala index d239e0fae..6c007f4fa 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class FrontendSyntaxAnalyzerTest extends Rql2TruffleCompilerTestContext { +class FrontendSyntaxAnalyzerTest extends Rql2TestContext { // Internal node, not visible to the user parser. test(s"""$$package("Collection")""".stripMargin)(it => it shouldNot parse) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala index 31fc94c28..ada97ea9a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ListSugarTest extends Rql2TruffleCompilerTestContext { +class ListSugarTest extends Rql2TestContext { test("""[1,2,3]""") { it => it should typeAs("list(int)") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala index 2b72c6bea..280d74d59 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.frontend.common.source._ import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class OperatorPrecedenceTest extends Rql2TruffleCompilerTestContext { +class OperatorPrecedenceTest extends Rql2TestContext { test("""1+2*3""") { it => it should evaluateTo("(1+(2*3))") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala index c283dd02a..7beb0cb5f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RecordSugarTest extends Rql2TruffleCompilerTestContext { +class RecordSugarTest extends Rql2TestContext { test("""{a: 1, b: "2"}""") { it => it should typeAs("record(a: int, b: string)") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala index 42a60ecc6..8f2c8cefd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD10194Test extends Rql2TruffleCompilerTestContext { +class RD10194Test extends Rql2TestContext { private val q = """main(title: string = null, description: string = null, category: string = null, rating: string = null, actor: string = null) = diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala index 6c77c468e..899b43252 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD10220Test extends Rql2TruffleCompilerTestContext { +class RD10220Test extends Rql2TestContext { test("""Csv.InferAndParse("stringData")""")( _ should (typeAs("collection(record(stringData: undefined))") and evaluateTo("[]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala index 2cffe5bef..b4ad9433a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD10723Test extends Rql2TruffleCompilerTestContext { +class RD10723Test extends Rql2TestContext { private val qqq = "\"\"\"" test(s"""main() = diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala index 2d4344ec0..76dccf870 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala @@ -13,10 +13,10 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.compiler.{GetProgramDescriptionSuccess, ProgramEnvironment} -import com.rawlabs.snapi.frontend.utils.SnapiInterpolator -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2.SnapiInterpolator +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD10767Test extends Rql2TruffleCompilerTestContext { +class RD10767Test extends Rql2TestContext { private val data = tempFile(""" |[ | {"a": 1, "b": 10, "c": 100}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala index 28c8bcfd5..49c6ed557 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils.SnapiInterpolator -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2.SnapiInterpolator +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD10801Test extends Rql2TruffleCompilerTestContext { +class RD10801Test extends Rql2TestContext { private val qqq = "\"\"\"" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala index c91c2625c..1b807119d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD3742Test extends Rql2TruffleCompilerTestContext { +class RD3742Test extends Rql2TestContext { val triple = "\"\"\"" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala index 0d93803df..c84467495 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD3784Test extends Rql2TruffleCompilerTestContext { +class RD3784Test extends Rql2TestContext { private val data = tempFile( """v diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala index 5bcb9f698..e16a76ca0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD4529Test extends Rql2TruffleCompilerTestContext { +class RD4529Test extends Rql2TestContext { test(""" |let a: float = 1.0f diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala index e9c836fb0..61849a682 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class RD4981Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class RD4981Test extends Rql2TestContext with LocalLocationsTestContext { test(snapi"""let | data = Csv.InferAndRead("$airportsLocal"), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala index c3332f3e3..efc82368a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class RD5238Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class RD5238Test extends Rql2TestContext with LocalLocationsTestContext { test(snapi""" |let region1 = Csv.InferAndRead("$tpchRegionCsvLocal"), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala index 705c434f9..89c2ff03c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala @@ -17,9 +17,9 @@ import org.bitbucket.inkytonik.kiama.util.Positions import org.scalatest.matchers.{MatchResult, Matcher} import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzer import com.rawlabs.snapi.frontend.rql2.source.SourcePrettyPrinter -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5365Test extends Rql2TruffleCompilerTestContext { +class RD5365Test extends Rql2TestContext { private class PrettyPrintAs(expected: String) extends Matcher[TestData] { override def apply(query: TestData): MatchResult = { diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala index 1362c0fcf..7e2cafec2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.snapi.frontend.rql2.errors.CannotDetermineTypeOfParameter -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5393Test extends Rql2TruffleCompilerTestContext { +class RD5393Test extends Rql2TestContext { test("""main(country: string = null,code: string = null) = | let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala index b607d6942..60f8ab1cc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5412Test extends Rql2TruffleCompilerTestContext { +class RD5412Test extends Rql2TestContext { test("""let | json_type = type record(creation_date: string, entries: list(string)), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala index ac8a0a6b5..f9e3ed9c0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5448Test extends Rql2TruffleCompilerTestContext { +class RD5448Test extends Rql2TestContext { private val ttt = "\"\"\"" private val jsonString = """[ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala index 6dc0b9ee1..ca110c8af 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5484Test extends Rql2TruffleCompilerTestContext { +class RD5484Test extends Rql2TestContext { // top-level and correct. test("""Timestamp.Build(2015, 1, 4, 22, 0)""")(_ should run) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala index 595e7ab8b..bfa1c0c50 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5488Test extends Rql2TruffleCompilerTestContext { +class RD5488Test extends Rql2TestContext { // All these tests are valid queries. They fail in the middle of compilation, at L0, with "lines is declared more than once". diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala index 7cf8648ba..dab01bf1c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5491Test extends Rql2TruffleCompilerTestContext { +class RD5491Test extends Rql2TestContext { test(s"""let | query = \"\"\"SELECT (?item as ?cat) ?itemLabel diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala index 5206fecea..5527869e7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5644Test extends Rql2TruffleCompilerTestContext { +class RD5644Test extends Rql2TestContext { // Basic reference behavior. The function parameter isn't type and inherits the list item type. Everything matches. test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala index 14124a4fa..ed79df231 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5679Test extends Rql2TruffleCompilerTestContext { +class RD5679Test extends Rql2TestContext { // regular XML file (types as record) with a list inside private val xml = tempFile(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala index e440a639a..365836822 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5685Test extends Rql2TruffleCompilerTestContext { +class RD5685Test extends Rql2TestContext { test("""let itemType = type int, | listType = type list(itemType), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala index 3128f7226..b8482079a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class RD5691Test extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class RD5691Test extends Rql2TestContext with LocalLocationsTestContext { test(s""" |let issueType = type record( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala index a122a110c..3691282ff 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ -class RD5697Test extends Rql2TruffleCompilerTestContext { +class RD5697Test extends Rql2TestContext { private val jsonFile = tempFile("""{"a": 12, "b": 14}""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala index 04afdb38e..502e77b3f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala @@ -13,11 +13,11 @@ package com.rawlabs.snapi.compiler.tests.regressions import java.nio.file.Files -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import scala.io.Source -class RD5714Test extends Rql2TruffleCompilerTestContext { +class RD5714Test extends Rql2TestContext { test("""let colA = [{id: 1, name: "john"}], | colB = [{id: 2, firstName: "john"}], diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala index d258e4364..b77726609 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5722Test extends Rql2TruffleCompilerTestContext { +class RD5722Test extends Rql2TestContext { test("""let data = Collection.Build({ | a: { b: 123} diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala index 3b1d82f84..71fd0f996 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD572Test extends Rql2TruffleCompilerTestContext { +class RD572Test extends Rql2TestContext { test("-128b") { it => it should typeAs("byte") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala index 96dd0a95a..42f3413df 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5775Test extends Rql2TruffleCompilerTestContext { +class RD5775Test extends Rql2TestContext { test("""let data = Http.Get("https://jira.atlassian.com/rest/api/latest/search", args=[{"jql", "fixVersion=9.0.0"}]), | r = Json.InferAndRead(data), | issues = Collection.Transform(r.issues, i -> { diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala index 002eb1f56..e41eb4ecc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Path -class RD5779Test extends Rql2TruffleCompilerTestContext { +class RD5779Test extends Rql2TestContext { val data: Path = tempFile("""[ | {"a": 1, "b": 10} |]""".stripMargin) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala index 2891e00a8..036a417ac 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ -class RD5784Test extends Rql2TruffleCompilerTestContext { +class RD5784Test extends Rql2TestContext { private val xmlFile = tempFile(""" | diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala index 8e3344bfb..0b3422403 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5785Test extends Rql2TruffleCompilerTestContext { +class RD5785Test extends Rql2TestContext { // The only way of this returning true is if all values in the list are the same. // Almost impossible with 5 random values. diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala index f7fa98461..de70a0afb 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5786Test extends Rql2TruffleCompilerTestContext { +class RD5786Test extends Rql2TestContext { test("""true == false""") { _ should evaluateTo(""" false """) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala index 10ab21ce0..68b945388 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala @@ -25,9 +25,9 @@ import com.rawlabs.compiler.{ Pos, TypeCompletion } -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5851Test extends Rql2TruffleCompilerTestContext { +class RD5851Test extends Rql2TestContext { def autoCompleteNames(entries: Array[Completion]): Seq[String] = { entries.map { diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala index 4d678dc4e..1a9fbd89c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5884Test extends Rql2TruffleCompilerTestContext { +class RD5884Test extends Rql2TestContext { test("""let f(x: int, y: int = 12) = 3.14 + x + y |in f(1)""".stripMargin)(_ should run) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala index c73e9be2f..30562d199 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5893Test extends Rql2TruffleCompilerTestContext { +class RD5893Test extends Rql2TestContext { // this has a list of text private val data = tempFile(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala index 87e71c016..2fb09adbb 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5914Test extends Rql2TruffleCompilerTestContext { +class RD5914Test extends Rql2TestContext { test("""let item1 = {name: "coffee machine", price: 200, price: 199}, // price is duplicated, price is an int | item2 = {name: "coffee machine", price: 200.00, price: 199.99} // price is duplicated, price is a double diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala index 43cbd174b..7c8a6e14e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5920Test extends Rql2TruffleCompilerTestContext { +class RD5920Test extends Rql2TestContext { test("""let f(x: int) = x * 10 |in f(10)""".stripMargin)(_ should evaluateTo("100")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala index dd1a859ad..c8cfc5cf5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5921Test extends Rql2TruffleCompilerTestContext { +class RD5921Test extends Rql2TestContext { val data1 = tempFile("""1 |2 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala index 4e76986ef..f7574e957 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5925Test extends Rql2TruffleCompilerTestContext { +class RD5925Test extends Rql2TestContext { test("""let c = Collection.Build(1, 2, 3, 4) |in Collection.Filter(c, s -> null)""".stripMargin) { it => diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala index f1964f2b9..c62d6ca1a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5932Test extends Rql2TruffleCompilerTestContext { +class RD5932Test extends Rql2TestContext { val data = tempFile("""[ | {"id": 1, "network_interface": "eni-08b85cc07294f82bf"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala index bc36a4bdf..e7b3a0e47 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5968Test extends Rql2TruffleCompilerTestContext { +class RD5968Test extends Rql2TestContext { private val cdataFile = tempFile(""" | diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala index aba2c15ee..28f8d0679 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5971Test extends Rql2TruffleCompilerTestContext { +class RD5971Test extends Rql2TestContext { // error when type isn't supported test(s"""[{a: "binary", b: [1,2,3,4]}]""") { it => diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala index 912b25304..c02cc1cbd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5979Test extends Rql2TruffleCompilerTestContext { +class RD5979Test extends Rql2TestContext { test("""[{a: 12, b: 14}, {c: 23, d: 54}]""")(_ should runErrorAs("expected compatible with")) test("""[{a: 12, b: 14}, {a: 23, d: 54}]""")(_ should runErrorAs("expected compatible with")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala index ab07eb477..f3b3e7751 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Path -class RD7924Test extends Rql2TruffleCompilerTestContext { +class RD7924Test extends Rql2TestContext { val string: Path = tempFile(""" "Hello!" """) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala index 1d1991055..0003a834c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala @@ -14,12 +14,12 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.RawUtils import org.scalatest.BeforeAndAfterEach -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.core._ import java.nio.file.Files -class RD7974Test extends Rql2TruffleCompilerTestContext with BeforeAndAfterEach { +class RD7974Test extends Rql2TestContext with BeforeAndAfterEach { private val tmpFile = Files.createTempFile("csv-output-test", ".csv") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala index 8b285de4c..c336cceb1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import org.scalatest.BeforeAndAfterEach -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD8530Test extends Rql2TruffleCompilerTestContext with BeforeAndAfterEach { +class RD8530Test extends Rql2TestContext with BeforeAndAfterEach { test("""List.Filter([1,2,3,4], n -> n > 2, a = 12)""".stripMargin)( _ should typeErrorAs("no optional arguments expected") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala index 73d48278c..9f9d4859a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD8764Test extends Rql2TruffleCompilerTestContext with StrictLogging { +class RD8764Test extends Rql2TestContext with StrictLogging { test(""" |let f: (record(_1: int, _2: int)) -> bool = (x: int, y: int) -> x == y diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala index 34204e1bd..b4596ac71 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD8935Test extends Rql2TruffleCompilerTestContext { +class RD8935Test extends Rql2TestContext { private val vowels = tempFile("""a |e diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala index 014ee5779..b0aeaa627 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD8993Test extends Rql2TruffleCompilerTestContext { +class RD8993Test extends Rql2TestContext { test("""apply(f: int -> bool) = f(1) |apply((x: int) -> true)""".stripMargin)(_ should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala index cca556891..3b338936e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9137Test extends Rql2TruffleCompilerTestContext with StrictLogging { +class RD9137Test extends Rql2TestContext with StrictLogging { test("""Json.InferAndRead("https://raw-tutorial.s3.eu-west-1.amazonaws.com/patients.json")""".stripMargin)( _ should run diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala index bb3e9547c..677b81435 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9228Test extends Rql2TruffleCompilerTestContext { +class RD9228Test extends Rql2TestContext { // pass a plain URL. It will be turned into a location, directly passed as a parameter. test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala index 5a374246f..25779ecff 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9229Test extends Rql2TruffleCompilerTestContext { +class RD9229Test extends Rql2TestContext { test(s"""[{a: "binary", b: [1,2,3,4]}]""") { it => option("output-format", "binary") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala index c29d038c3..001b05744 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala @@ -30,11 +30,11 @@ import com.rawlabs.compiler.{ RawValue } import org.scalatest.EitherValues -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.time.{Duration, LocalDate, LocalDateTime, LocalTime} -class RD9255Test extends Rql2TruffleCompilerTestContext with EitherValues { +class RD9255Test extends Rql2TestContext with EitherValues { private val declarations = """ |string_func(x: string) = String.Length(x) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala index c1be35863..111c0fa38 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.rql2._ import java.nio.file.{Files, Path} -class RD9359Test extends Rql2TruffleCompilerTestContext { +class RD9359Test extends Rql2TestContext { private val duplicateCsvString = """a,b,a |1,2,3 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala index 61107220c..3ee615930 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.compiler.{HoverResponse, Pos, TypeCompletion} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9409Test extends Rql2TruffleCompilerTestContext { +class RD9409Test extends Rql2TestContext { test("""let | a = 1, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala index 6293590b7..99877ee34 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala @@ -14,12 +14,12 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData import org.scalatest.matchers.{MatchResult, Matcher} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import java.nio.file.Files import scala.io.Source -class RD9445Test extends Rql2TruffleCompilerTestContext { +class RD9445Test extends Rql2TestContext { def outputAs(expected: String, format: String = "json") = new OutputAs(expected, format) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala index d4ea1e1cb..65ad2a244 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9479Test extends Rql2TruffleCompilerTestContext { +class RD9479Test extends Rql2TestContext { private val recordData = tempFile("""[{"a": 1, "b": 10, "c": 100}]""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala index 39eafb9af..763bf4b73 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9485Test extends Rql2TruffleCompilerTestContext { +class RD9485Test extends Rql2TestContext { property("raw.snapi.frontend.inferrer.local.xml.sample-size", "2") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala index 1a8a9210b..134a9cd4f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9554Test extends Rql2TruffleCompilerTestContext { +class RD9554Test extends Rql2TestContext { test("""let range = Int.Range(0,5) |in Collection.Union(range, range)""".stripMargin) { it => diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala index c7f75019d..eaeb66be3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9616Test extends Rql2TruffleCompilerTestContext { +class RD9616Test extends Rql2TestContext { test( """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala index d110434fa..bc178d66e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD9932Test extends Rql2TruffleCompilerTestContext { +class RD9932Test extends Rql2TestContext { val ttt = "\"\"\"" test(s"""Json.Parse( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala index 1f54c6ed4..20dd39439 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD3084Test extends Rql2TruffleCompilerTestContext { +class RD3084Test extends Rql2TestContext { rdbms("mysql-test", TestCredentials.mysqlCreds) rdbms("postgres-test", TestCredentials.pgsqlCreds) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala index 2e98de53a..a8fc38135 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions.credentials import com.rawlabs.protocol.compiler.DropboxAccessTokenConfig -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD4445Test extends Rql2TruffleCompilerTestContext { +class RD4445Test extends Rql2TestContext { import com.rawlabs.snapi.compiler.tests.TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala index 14656dab6..3473efdea 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class RD5932Test extends Rql2TruffleCompilerTestContext { +class RD5932Test extends Rql2TestContext { s3Bucket(TestCredentials.UnitTestPrivateBucket, TestCredentials.UnitTestPrivateBucketCred) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala index 56c412eb3..07ce2c497 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BasicStagedCompilerTest extends Rql2TruffleCompilerTestContext { +class BasicStagedCompilerTest extends Rql2TestContext { test("""TestPackage.ByteValueArg(22b)""")(_ should evaluateTo("{arg: 22b}")) test("""TestPackage.ShortValueArg(22s)""")(_ should evaluateTo("{arg: 22s}")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala index d7e89e496..020f41529 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpAndTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class BinaryExpAndTest extends Rql2TestContext with TableDrivenPropertyChecks { test("""true and true""")(_ should evaluateTo("true")) test("""true and false""")(_ should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala index 2569467d5..760ea1835 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpDivTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpDivTest extends Rql2TestContext with CombinationSpecTestHelper { test("""4 / 2""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala index 9517ed134..134adb794 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpEqTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpEqTest extends Rql2TestContext with CombinationSpecTestHelper { test("1 == 1")(it => it should evaluateTo("true")) test("1 == 2")(it => it should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala index 75ffc764e..b8258e485 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpGeTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpGeTest extends Rql2TestContext with CombinationSpecTestHelper { test("1 >= 1")(it => it should evaluateTo("true")) test("1 >= 2")(it => it should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala index 12129da5e..a4ca7be50 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpGtTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpGtTest extends Rql2TestContext with CombinationSpecTestHelper { test("1 > 1")(it => it should evaluateTo("false")) test("1 > 2")(it => it should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala index 76e14a455..94a3c0d08 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpLeTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpLeTest extends Rql2TestContext with CombinationSpecTestHelper { test("1 <= 1")(it => it should evaluateTo("true")) test("1 <= 2")(it => it should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala index 1f60ebbd5..54af58303 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpLtTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpLtTest extends Rql2TestContext with CombinationSpecTestHelper { test("1 < 1")(it => it should evaluateTo("false")) test("1 < 2")(it => it should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala index 27f7a2c61..096efd4c6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpModTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpModTest extends Rql2TestContext with CombinationSpecTestHelper { test("""5 % 3""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala index 97cbfa809..35d029d94 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpMultTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpMultTest extends Rql2TestContext with CombinationSpecTestHelper { test("""1 * 1""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala index e73208926..b27e0650f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpNeqTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpNeqTest extends Rql2TestContext with CombinationSpecTestHelper { test("1 != 1")(it => it should evaluateTo("false")) test("1 != 2")(it => it should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala index 984a71c82..34a0bd67c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpOrTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class BinaryExpOrTest extends Rql2TestContext with TableDrivenPropertyChecks { test("""true or true""")(_ should evaluateTo("true")) test("""true or false""")(_ should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala index 6b9f1e23a..ece722370 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpPlusTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpPlusTest extends Rql2TestContext with CombinationSpecTestHelper { test("""1 + 1""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala index ee9709adb..1580b4b08 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class BinaryExpSubTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class BinaryExpSubTest extends Rql2TestContext with CombinationSpecTestHelper { test("""1 - 1""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala index ede2f6084..ea5a3919f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ClosureTest extends Rql2TruffleCompilerTestContext { +class ClosureTest extends Rql2TestContext { test("""let functions = | List.Transform([1,2,3], diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala index e9bcc050c..67d9c7b35 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala @@ -15,9 +15,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks import com.rawlabs.snapi.frontend.rql2.source.{Rql2BoolType, Rql2IntType, Rql2StringType} -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ConstTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class ConstTest extends Rql2TestContext with TableDrivenPropertyChecks { test("1") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala index 005a14a41..ae1d545a6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ErrorsTest extends Rql2TruffleCompilerTestContext { +class ErrorsTest extends Rql2TestContext { test("""Collection.Count("a")""")(_ shouldNot tipe) test("""Collection.Count(Collection.Count("a"))""")(_ shouldNot tipe) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala index 8e1ec8e73..35434b643 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class FunAbsTest extends Rql2TruffleCompilerTestContext { +class FunAbsTest extends Rql2TestContext { test(""" |let f = (v: int) -> v + 1 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala index fdb35eb4e..9a2b46ffc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class IfThenElseTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class IfThenElseTest extends Rql2TestContext with CombinationSpecTestHelper { test(""" |if true then "a" else "b" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala index 7e4197e15..8e03939e1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ImplicitCastTest extends Rql2TruffleCompilerTestContext { +class ImplicitCastTest extends Rql2TestContext { // compatible options as function param test(s"""let f = (x: int) -> Record.Build(o = x) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala index bf9a98612..412f0983c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -import com.rawlabs.snapi.frontend.utils._ +import com.rawlabs.snapi.frontend.rql2._ -class JoinWithTryRowsTest extends Rql2TruffleCompilerTestContext with LocalLocationsTestContext { +class JoinWithTryRowsTest extends Rql2TestContext with LocalLocationsTestContext { /* testing joins with failed rows. How a dataset of failed rows is built: by engineering a dataset of nested list of records, and pick one using List.Get so that it sometimes diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala index e224d67b3..eb6a7b8ea 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LetBindTest extends Rql2TruffleCompilerTestContext with CombinationSpecTestHelper { +class LetBindTest extends Rql2TestContext with CombinationSpecTestHelper { test("""let x = 1 |in x diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala index e1c12dfde..0e2a7a32f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.snapi.frontend.rql2.errors.OutputTypeRequiredForRecursiveFunction -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LetFunRecTest extends Rql2TruffleCompilerTestContext { +class LetFunRecTest extends Rql2TestContext { test("""let rec fact(v: int): int = if (v > 1) then v * fact(v - 1) else v |in fact(4) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala index 450d44aa4..f54535e6a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LetFunTest extends Rql2TruffleCompilerTestContext { +class LetFunTest extends Rql2TestContext { test("""let f(x: int) = x + 1 |in f(0) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala index 835ec1f62..1d8746387 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LetTypeTest extends Rql2TruffleCompilerTestContext { +class LetTypeTest extends Rql2TestContext { test(""" |let t = type int, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala index 4473c5881..f24f18ece 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala @@ -18,9 +18,9 @@ import com.rawlabs.snapi.frontend.rql2.source.{ Rql2IsTryableTypeProperty, Rql2UndefinedType } -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class MigrationTest extends Rql2TruffleCompilerTestContext { +class MigrationTest extends Rql2TestContext { test("1") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala index 8c589c15e..458463cc7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class PackageNameTest extends Rql2TruffleCompilerTestContext { +class PackageNameTest extends Rql2TestContext { test("""Record""")(it => it should typeAs("""package("Record")""")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala index 21929eb2d..f03693c65 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class ProjTest extends Rql2TruffleCompilerTestContext { +class ProjTest extends Rql2TestContext { test("""let a = {x: 1} |in a.x diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala index d7775c14a..e92216788 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class PropagationTest extends Rql2TruffleCompilerTestContext { +class PropagationTest extends Rql2TestContext { // lists test("""let l = List.Build(1,2,3,2,1) |in TestPackage.StrictArgs(l)""".stripMargin)(_ should (typeAs("float") and evaluateTo("5.0f"))) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala index 91c63bd8d..9f8fe1c17 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.frontend.utils._ -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class StagedCompilerTest extends Rql2TruffleCompilerTestContext { +class StagedCompilerTest extends Rql2TestContext { val data = tempFile(""" |[ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala index 822f8b492..5f01e623c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class UnaryExpNegTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class UnaryExpNegTest extends Rql2TestContext with TableDrivenPropertyChecks { test("- 1") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala index 9c40273b3..3811d58ed 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.truffle.Rql2TruffleCompilerTestContext +import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class UnaryExpNotTest extends Rql2TruffleCompilerTestContext with TableDrivenPropertyChecks { +class UnaryExpNotTest extends Rql2TestContext with TableDrivenPropertyChecks { test("""not true""".stripMargin) { it => it should typeAs("bool") it should evaluateTo("false") diff --git a/snapi-frontend/src/main/java/module-info.java b/snapi-frontend/src/main/java/module-info.java index e8c0a09da..5b2977fd3 100644 --- a/snapi-frontend/src/main/java/module-info.java +++ b/snapi-frontend/src/main/java/module-info.java @@ -38,6 +38,7 @@ requires jul.to.slf4j; requires org.graalvm.polyglot; requires raw.utils.core; + requires raw.protocol.raw; requires raw.protocol.compiler; requires raw.compiler; requires raw.utils.sources; @@ -46,21 +47,18 @@ exports com.rawlabs.snapi.frontend.base; exports com.rawlabs.snapi.frontend.base.errors; exports com.rawlabs.snapi.frontend.base.source; - exports com.rawlabs.snapi.frontend.common; - exports com.rawlabs.snapi.frontend.common.source; exports com.rawlabs.snapi.frontend.rql2; - exports com.rawlabs.snapi.frontend.rql2.api; - exports com.rawlabs.snapi.frontend.rql2.builtin; - exports com.rawlabs.snapi.frontend.rql2.errors; - exports com.rawlabs.snapi.frontend.rql2.lsp; exports com.rawlabs.snapi.frontend.rql2.source; + exports com.rawlabs.snapi.frontend.rql2.phases; + exports com.rawlabs.snapi.frontend.rql2.errors; exports com.rawlabs.snapi.frontend.rql2.antlr4; - exports com.rawlabs.snapi.frontend.utils; + exports com.rawlabs.snapi.frontend.rql2.extensions; + exports com.rawlabs.snapi.frontend.rql2.extensions.builtin; exports com.rawlabs.snapi.frontend.inferrer.api; exports com.rawlabs.snapi.frontend.inferrer.local; opens com.rawlabs.snapi.frontend.inferrer.api to com.fasterxml.jackson.databind; - opens com.rawlabs.snapi.frontend.rql2.api to + opens com.rawlabs.snapi.frontend.rql2.extensions to com.fasterxml.jackson.databind; } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/Attribution.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Attribution.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/Attribution.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Attribution.scala index 164979951..ccf47b970 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/Attribution.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Attribution.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.utils +package com.rawlabs.snapi.frontend.base import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.attribution.Attribute diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala index ddd0ff499..9e7eb6268 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/BaseTree.scala @@ -17,7 +17,6 @@ import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.relation.{EnsureTree, LeaveAlone, TreeRelation} import com.rawlabs.snapi.frontend.base.errors.{CompilationMessageMapper, ErrorCompilerMessage} import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.utils.ExtraRewriters abstract class BaseTree[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest](ensureTree: Boolean)( implicit val programContext: ProgramContext diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala index 24d407633..244c5b825 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/CompilerContext.scala @@ -14,7 +14,7 @@ package com.rawlabs.snapi.frontend.base import com.rawlabs.utils.core.{RawSettings, RawUid} import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.frontend.inferrer.api.{InferrerProperties, InferrerService, InputFormatDescriptor} +import com.rawlabs.snapi.frontend.inferrer.api.{InferrerInput, InferrerOutput, InferrerService} import com.rawlabs.utils.core._ /** @@ -28,7 +28,7 @@ class CompilerContext( implicit val settings: RawSettings ) extends StrictLogging { - def infer(properties: InferrerProperties): Either[String, InputFormatDescriptor] = { + def infer(properties: InferrerInput): Either[String, InferrerOutput] = { inferrer.inferWithExpiry(properties) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/ExtraRewriters.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/ExtraRewriters.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/ExtraRewriters.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/ExtraRewriters.scala index 6fe014aa9..bf2fc4988 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/ExtraRewriters.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/ExtraRewriters.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.utils +package com.rawlabs.snapi.frontend.base import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.id diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala index deedec3e0..a9c7256a2 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/SemanticAnalyzer.scala @@ -18,7 +18,6 @@ import org.bitbucket.inkytonik.kiama.attribution.Decorators import org.bitbucket.inkytonik.kiama.util.{Entity, Environments} import com.rawlabs.snapi.frontend.base.errors._ import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.utils.{Attribution, ExtraRewriters} /** Used by some methods as a helper to avoid returning Either. */ class UnsupportedTypeException(val t: Type) extends Throwable { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala index f0e5404a1..d46d15c34 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala @@ -16,7 +16,7 @@ import com.rawlabs.utils.core.RawUtils import org.apache.commons.lang3.StringUtils import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.common.source.ErrorType +import com.rawlabs.snapi.frontend.rql2.source.ErrorType import com.rawlabs.utils.core._ abstract class Tree[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest]( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala index 75f80f65a..386454600 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/source/SourceTree.scala @@ -39,26 +39,26 @@ trait BaseIdnNode extends BaseNode { trait BaseProgram extends BaseNode -trait RawBridge[T] +trait BaseBridge[T] // A true Bridge which prevents nested languages from seeing each other. // (Kiama's default Bridge is a case class, so collect/query/everywhere still go through it...) -final class RawBridgeImpl[T](val language: String, val cross: T) extends RawBridge[T] { +final class BaseBridgeImpl[T](val language: String, val cross: T) extends BaseBridge[T] { override def toString: String = s"$language: ${cross.toString}" } -object RawBridgeImpl { - def apply[T](language: String, cross: T): RawBridgeImpl[T] = new RawBridgeImpl(language, cross) +object BaseBridgeImpl { + def apply[T](language: String, cross: T): BaseBridgeImpl[T] = new BaseBridgeImpl(language, cross) - def unapply[T](arg: RawBridgeImpl[T]): Option[(String, T)] = Some((arg.language, arg.cross)) + def unapply[T](arg: BaseBridgeImpl[T]): Option[(String, T)] = Some((arg.language, arg.cross)) } // This node is only used during code templated phase (refer to Compiler.template). // It is never part of compiler phases and only used during code execution, as a way to refer // to a program (which can be found by 'id' on the ProgramContext) of a given type 't'. -final class RawBridgeRef[T](val t: Type, val id: String) extends RawBridge[T] +final class BaseBridgeRef[T](val t: Type, val id: String) extends BaseBridge[T] -object RawBridgeRef { - def apply[T](t: Type, id: String) = new RawBridgeRef[T](t, id) - def unapply[T](arg: RawBridgeRef[T]): Option[(Type, String)] = Some((arg.t, arg.id)) +object BaseBridgeRef { + def apply[T](t: Type, id: String) = new BaseBridgeRef[T](t, id) + def unapply[T](arg: BaseBridgeRef[T]): Option[(Type, String)] = Some((arg.t, arg.id)) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala deleted file mode 100644 index 28ebe27ad..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/source/SourceTree.scala +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.common.source - -import org.bitbucket.inkytonik.kiama.output._ -import com.rawlabs.snapi.frontend.base.source.Type -import org.bitbucket.inkytonik.kiama.output.PrettyExpression -import org.bitbucket.inkytonik.kiama.rewriting.Strategy -import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ -import com.rawlabs.snapi.frontend.base.Counter -import com.rawlabs.snapi.frontend.base.source._ - -trait SourceNode extends BaseNode - -object SourceTree { - import org.bitbucket.inkytonik.kiama.relation.Tree - - type SourceTree = Tree[SourceNode, SourceProgram] -} - -/** - * Top-level source node. - */ -trait SourceProgram extends SourceNode with BaseProgram { - def params: Vector[SourceProgramParam] - def comment: Option[String] = None -} - -final case class SourceProgramParam(idn: CommonIdnNode, t: Type) extends CommonNode - -/** - * Qualifiers - */ -// TODO (msb): These are best called "Statements" because that's (also?) what they are -// Qual is more general than Stmt: a Gen is a Qual but not a Stmt while Bind is -trait Qual extends SourceNode - -/** - * Declarations - */ -trait Decl extends SourceNode with Qual - -/** - * Expressions - */ -trait Exp extends SourceNode with Qual with PrettyExpression - -/** - * * From now on are "common language"-related nodes. ** - */ - -/** - * Parent of all "common language" nodes. - */ -trait CommonNode extends SourceNode - -/** - * Parent of all "common language" types. - */ -trait CommonType extends Type with CommonNode - -/** - * Any Type - * The top type. - */ -final case class AnyType() extends CommonType - -/** - * Nothing Type - * The bottom type. - */ -final case class NothingType() extends CommonType - -/** - * This type is used when the tree has errors. - */ -final case class ErrorType() extends CommonType - -/** - * Parent of all "common language" expressions. - */ -trait CommonExp extends Exp with CommonNode - -/////////////////////////////////////////////////////////////////////////// -// Type Constraints -/////////////////////////////////////////////////////////////////////////// - -trait CommonTypeConstraint extends CommonType - -/** - * One-of Type constraint. - */ -final case class OneOfType(tipes: Vector[Type]) extends CommonTypeConstraint - -object OneOfType { - def apply(tipes: Type*): OneOfType = { - OneOfType(tipes.toVector) - } -} - -final case class ExpectedRecordType(idns: Set[String]) extends CommonTypeConstraint - -/////////////////////////////////////////////////////////////////////////// -// Identifiers -/////////////////////////////////////////////////////////////////////////// - -abstract class CommonIdnNode extends BaseIdnNode with CommonNode - -/** - * Defining occurrence of an identifier - */ -final case class IdnDef(idn: String) extends CommonIdnNode - -object IdnDef { - def apply(): IdnDef = IdnDef(Counter.next("common")) -} - -/** - * Use of an identifier - */ -final case class IdnUse(idn: String) extends CommonIdnNode - -object IdnUse { - def apply(i: IdnDef): IdnUse = IdnUse(i.idn) -} - -/** - * Identifier expression - */ -final case class IdnExp(idn: IdnUse) extends CommonExp - -object IdnExp { - def apply(i: IdnDef): IdnExp = IdnExp(IdnUse(i.idn)) - def apply(i: String): IdnExp = IdnExp(IdnUse(i)) - def apply(p: SourceProgramParam): IdnExp = IdnExp(p.idn.idn) - def apply(p: BaseIdnNode): IdnExp = IdnExp(p.idn) -} - -/////////////////////////////////////////////////////////////////////////// -// Expressions -/////////////////////////////////////////////////////////////////////////// - -/** - * Bind - */ -final case class Bind(e: Exp, idn: IdnDef) extends CommonNode with Decl - -object Bind { - def apply(e: Strategy, idn: Strategy): Strategy = { - rulefs[Bind] { case _ => congruence(e, idn) } - } - - def apply(idn: IdnDef, e: Exp): Bind = Bind(e, idn) -} - -final case class ErrorExp() extends CommonExp diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerProperties.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerInput.scala similarity index 71% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerProperties.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerInput.scala index b730c6969..836cefb11 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerProperties.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerInput.scala @@ -17,20 +17,19 @@ import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation import com.rawlabs.utils.sources.jdbc.api.{JdbcServerLocation, JdbcTableLocation} -sealed trait InferrerProperties { +sealed trait InferrerInput { def maybeSampleSize: Option[Int] } -final case class SqlTableInferrerProperties(location: JdbcTableLocation, maybeSampleSize: Option[Int]) - extends InferrerProperties +final case class SqlTableInferrerInput(location: JdbcTableLocation, maybeSampleSize: Option[Int]) extends InferrerInput -final case class SqlQueryInferrerProperties( +final case class SqlQueryInferrerInput( location: JdbcServerLocation, sql: String, maybeSampleSize: Option[Int] -) extends InferrerProperties +) extends InferrerInput -final case class CsvInferrerProperties( +final case class CsvInferrerInput( location: ByteStreamLocation, maybeSampleSize: Option[Int], maybeEncoding: Option[Encoding], @@ -41,9 +40,9 @@ final case class CsvInferrerProperties( maybeSkip: Option[Int], maybeEscapeChar: Option[Char], maybeQuoteChars: Option[Seq[Option[Char]]] -) extends InferrerProperties +) extends InferrerInput -final case class ManyCsvInferrerProperties( +final case class ManyCsvInferrerInput( location: FileSystemLocation, maybeSampleSize: Option[Int], maybeSampleFiles: Option[Int], @@ -55,54 +54,54 @@ final case class ManyCsvInferrerProperties( maybeSkip: Option[Int], maybeEscapeChar: Option[Char], maybeQuoteChars: Option[Seq[Option[Char]]] -) extends InferrerProperties +) extends InferrerInput -final case class HjsonInferrerProperties( +final case class HjsonInferrerInput( location: ByteStreamLocation, maybeSampleSize: Option[Int], maybeEncoding: Option[Encoding] -) extends InferrerProperties +) extends InferrerInput -final case class ManyHjsonInferrerProperties( +final case class ManyHjsonInferrerInput( location: FileSystemLocation, maybeSampleSize: Option[Int], maybeSampleFiles: Option[Int], maybeEncoding: Option[Encoding] -) extends InferrerProperties +) extends InferrerInput -final case class JsonInferrerProperties( +final case class JsonInferrerInput( location: ByteStreamLocation, maybeSampleSize: Option[Int], maybeEncoding: Option[Encoding] -) extends InferrerProperties +) extends InferrerInput -final case class ManyJsonInferrerProperties( +final case class ManyJsonInferrerInput( location: FileSystemLocation, maybeSampleSize: Option[Int], maybeSampleFiles: Option[Int], maybeEncoding: Option[Encoding] -) extends InferrerProperties +) extends InferrerInput -final case class XmlInferrerProperties( +final case class XmlInferrerInput( location: ByteStreamLocation, maybeSampleSize: Option[Int], maybeEncoding: Option[Encoding] -) extends InferrerProperties +) extends InferrerInput -final case class ManyXmlInferrerProperties( +final case class ManyXmlInferrerInput( location: FileSystemLocation, maybeSampleSize: Option[Int], maybeSampleFiles: Option[Int], maybeEncoding: Option[Encoding] -) extends InferrerProperties +) extends InferrerInput -final case class AutoInferrerProperties( +final case class AutoInferrerInput( location: Location, maybeSampleSize: Option[Int] -) extends InferrerProperties +) extends InferrerInput -final case class ManyAutoInferrerProperties( +final case class ManyAutoInferrerInput( location: FileSystemLocation, maybeSampleSize: Option[Int], maybeSampleFiles: Option[Int] -) extends InferrerProperties +) extends InferrerInput diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InputFormatDescriptors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerOutput.scala similarity index 58% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InputFormatDescriptors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerOutput.scala index 5b609d582..312f19f80 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InputFormatDescriptors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerOutput.scala @@ -14,27 +14,27 @@ package com.rawlabs.snapi.frontend.inferrer.api import com.rawlabs.utils.sources.api.Encoding -sealed trait InputFormatDescriptor { +sealed trait InferrerOutput { def tipe: SourceType } -final case class SqlTableInputFormatDescriptor(tipe: SourceType) extends InputFormatDescriptor +final case class SqlTableInferrerOutput(tipe: SourceType) extends InferrerOutput -final case class SqlQueryInputFormatDescriptor(tipe: SourceType) extends InputFormatDescriptor +final case class SqlQueryInferrerOutput(tipe: SourceType) extends InferrerOutput -sealed trait InputStreamFormatDescriptor extends InputFormatDescriptor +sealed trait InputStreamInferrerOutput extends InferrerOutput -final case class TextInputStreamFormatDescriptor(encoding: Encoding, confidence: Int, format: TextInputFormatDescriptor) - extends InputStreamFormatDescriptor { +final case class TextInputStreamInferrerOutput(encoding: Encoding, confidence: Int, format: TextFormatDescriptor) + extends InputStreamInferrerOutput { def tipe: SourceType = format.tipe } -sealed trait TextInputFormatDescriptor { +sealed trait TextFormatDescriptor { def tipe: SourceType def sampled: Boolean } -final case class CsvInputFormatDescriptor( +final case class CsvFormatDescriptor( tipe: SourceType, hasHeader: Boolean, delimiter: Char, @@ -48,31 +48,31 @@ final case class CsvInputFormatDescriptor( timeFormat: Option[String], dateFormat: Option[String], timestampFormat: Option[String] -) extends TextInputFormatDescriptor +) extends TextFormatDescriptor -final case class JsonInputFormatDescriptor( +final case class JsonFormatDescriptor( tipe: SourceType, sampled: Boolean, timeFormat: Option[String], dateFormat: Option[String], timestampFormat: Option[String] -) extends TextInputFormatDescriptor +) extends TextFormatDescriptor -final case class HjsonInputFormatDescriptor( +final case class HjsonFormatDescriptor( tipe: SourceType, sampled: Boolean, timeFormat: Option[String], dateFormat: Option[String], timestampFormat: Option[String] -) extends TextInputFormatDescriptor +) extends TextFormatDescriptor -final case class XmlInputFormatDescriptor( +final case class XmlFormatDescriptor( tipe: SourceType, sampled: Boolean, timeFormat: Option[String], dateFormat: Option[String], timestampFormat: Option[String] -) extends TextInputFormatDescriptor +) extends TextFormatDescriptor -final case class LinesInputFormatDescriptor(tipe: SourceType, regex: Option[String], sampled: Boolean) - extends TextInputFormatDescriptor +final case class LinesFormatDescriptor(tipe: SourceType, regex: Option[String], sampled: Boolean) + extends TextFormatDescriptor diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala index 10d9bcfda..faf291135 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/InferrerService.scala @@ -25,8 +25,6 @@ object InferrerService { private val INFERRER_CACHE_SIZE = "raw.snapi.frontend.inferrer.cache-size" private val INFERRER_THREAD_POOL_SIZE = "raw.snapi.frontend.inferrer.thread-pool-size" - - private val prettyPrinter = new SourceTypePrettyPrinter } abstract class InferrerService(implicit settings: RawSettings) extends RawService { @@ -45,22 +43,22 @@ abstract class InferrerService(implicit settings: RawSettings) extends RawServic // The main entrypoint for the inferrer. // Using an exception for inference is reasonable because we often want inference to exit early. @throws[RawException] - def infer(properties: InferrerProperties): InputFormatDescriptor + def infer(properties: InferrerInput): InferrerOutput // Inferrer that uses internal cache and expiry. // Instead of an exception, it returns an Either (since the timeout error is returned as a Left). // @param timeout How long the inference can take before aborting with an exception. // @param expiry How long an old result of the inference is still accepted as valid. - final def inferWithExpiry(properties: InferrerProperties): Either[String, InputFormatDescriptor] = { + final def inferWithExpiry(properties: InferrerInput): Either[String, InferrerOutput] = { inferCache.get(properties) } - private val inferCache: LoadingCache[InferrerProperties, Either[String, InputFormatDescriptor]] = CacheBuilder + private val inferCache: LoadingCache[InferrerInput, Either[String, InferrerOutput]] = CacheBuilder .newBuilder() .maximumSize(inferrerCacheSize) .expireAfterAccess(inferrerExpirySeconds, TimeUnit.SECONDS) - .build(new CacheLoader[InferrerProperties, Either[String, InputFormatDescriptor]] { - def load(properties: InferrerProperties): Either[String, InputFormatDescriptor] = { + .build(new CacheLoader[InferrerInput, Either[String, InferrerOutput]] { + def load(properties: InferrerInput): Either[String, InferrerOutput] = { val inferrerFuture = inferrerThreadPool.submit(() => { try { Right(infer(properties)) @@ -86,10 +84,6 @@ abstract class InferrerService(implicit settings: RawSettings) extends RawServic } }) - final def prettyPrint(sourceType: SourceType): String = { - prettyPrinter.format(sourceType) - } - final override def doStop(): Unit = { RawUtils.withSuppressNonFatalException { inferrerThreadPool.shutdownNow() diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala deleted file mode 100644 index c88ba92d1..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypePrettyPrinter.scala +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.inferrer.api - -import org.bitbucket.inkytonik.kiama.output.PrettyPrinter - -class SourceTypePrettyPrinter extends PrettyPrinter { - - override val defaultIndent = 2 - - override val defaultWidth = 60 - - implicit class extraDocOps(private val d: Doc) extends Doc(d.f) { - def ?<>(cond: Boolean, other: => Doc): Doc = if (cond) this <> other else this - def ?<+>(cond: Boolean, other: => Doc): Doc = if (cond) this <+> other else this - // def ?<>(v: Option[Doc]): Doc = if (v.isDefined) this <> v.get else this - // def ?<+>(v: Option[Doc]): Doc = if (v.isEmpty) this <+> v.get else this - } - - def format(t: SourceType): String = pretty(toDoc(t)).layout - - def toDoc(t: SourceType): Doc = t match { - case _: SourceNothingType => text("nothing") - case _: SourceAnyType => text("any") - case _: SourceNullType => text("null") - case SourceByteType(nullable) => text("byte") ?<+> (nullable, "nullable") - case SourceShortType(nullable) => text("short") ?<+> (nullable, "nullable") - case SourceIntType(nullable) => text("int") ?<+> (nullable, "nullable") - case SourceLongType(nullable) => text("long") ?<+> (nullable, "nullable") - case SourceFloatType(nullable) => text("float") ?<+> (nullable, "nullable") - case SourceDoubleType(nullable) => text("double") ?<+> (nullable, "nullable") - case SourceDecimalType(nullable) => text("decimal") ?<+> (nullable, "nullable") - case SourceBoolType(nullable) => text("bool") ?<+> (nullable, "nullable") - case SourceStringType(nullable) => text("string") ?<+> (nullable, "nullable") - case SourceDateType(fmt, nullable) => text("date") <> parens(text(fmt.getOrElse(""))) ?<+> (nullable, "nullable") - case SourceTimeType(fmt, nullable) => text("time") <> parens(text(fmt.getOrElse(""))) ?<+> (nullable, "nullable") - case SourceTimestampType(fmt, nullable) => - text("timestamp") <> parens(text(fmt.getOrElse(""))) ?<+> (nullable, "nullable") - case SourceIntervalType(nullable) => text("interval") ?<+> (nullable, "nullable") - case SourceBinaryType(nullable) => text("blob") ?<+> (nullable, "nullable") - case SourceOrType(tipes) => tipes.tail.foldLeft(toDoc(tipes.head)) { case (acc, t) => acc <+> "or" <+> toDoc(t) } - case SourceRecordType(atts, nullable) => - val attsDoc = atts.map(att => backquote <> text(att.idn) <> backquote <> ":" <+> toDoc(att.tipe)) - text("record") <> parens(group(nest(lsep(attsDoc, ",")))) ?<+> (nullable, "nullable") - case SourceCollectionType(inner, nullable) => - text("collection") <> parens(group(nest(toDoc(inner)))) ?<+> (nullable, "nullable") - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala index 96dc5b1fa..14b761e3c 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/api/SourceTypes.scala @@ -55,7 +55,7 @@ final case class SourceRecordType(atts: Vector[SourceAttrType], nullable: Boolea final case class SourceCollectionType(innerType: SourceType, nullable: Boolean) extends SourceNullableType object SourceNullableType { - def cloneNullable(t: SourceNullableType, nullable: Boolean): SourceNullableType = t match { + def setNullableShallowClone(t: SourceNullableType, nullable: Boolean): SourceNullableType = t match { case SourceByteType(_) => SourceByteType(nullable) case SourceShortType(_) => SourceShortType(nullable) case SourceIntType(_) => SourceIntType(nullable) @@ -77,16 +77,17 @@ object SourceNullableType { t } - def cloneAsNullable(t: SourceNullableType): SourceNullableType = cloneNullable(t, nullable = true) + def setNullableShallowClone(t: SourceNullableType): SourceNullableType = setNullableShallowClone(t, nullable = true) - def cloneAsNotNullable(t: SourceNullableType): SourceNullableType = cloneNullable(t, nullable = false) + def setNotNullableShallowClone(t: SourceNullableType): SourceNullableType = + setNullableShallowClone(t, nullable = false) - def deepCloneAsNullable(t: SourceType): SourceType = t match { - case SourceCollectionType(innerType, _) => SourceCollectionType(deepCloneAsNullable(innerType), true) + def setNullableDeepClone(t: SourceType): SourceType = t match { + case SourceCollectionType(innerType, _) => SourceCollectionType(setNullableDeepClone(innerType), true) case SourceRecordType(atts, _) => - SourceRecordType(atts.map(att => SourceAttrType(att.idn, deepCloneAsNullable(att.tipe))), true) - case x: SourceNullableType => cloneAsNullable(x) - case SourceOrType(inner) => SourceOrType(inner.map(x => deepCloneAsNullable(x).asInstanceOf[SourceNullableType])) + SourceRecordType(atts.map(att => SourceAttrType(att.idn, setNullableDeepClone(att.tipe))), true) + case x: SourceNullableType => setNullableShallowClone(x) + case SourceOrType(inner) => SourceOrType(inner.map(x => setNullableDeepClone(x).asInstanceOf[SourceNullableType])) case _ => t } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala index 0ef48c6d9..a6aadd7a7 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala @@ -15,7 +15,7 @@ package com.rawlabs.snapi.frontend.inferrer.local import com.rawlabs.utils.core.{RawException, RawSettings} import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.output.PrettyPrinter -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription import com.rawlabs.snapi.frontend.inferrer.api._ import com.rawlabs.snapi.frontend.inferrer.local.auto.{AutoInferrer, InferrerBufferedSeekableIS} import com.rawlabs.snapi.frontend.inferrer.local.csv.{CsvInferrer, CsvMergeTypes} @@ -65,16 +65,16 @@ class LocalInferrerService(implicit settings: RawSettings) } } - override def infer(properties: InferrerProperties): InputFormatDescriptor = { + override def infer(properties: InferrerInput): InferrerOutput = { try { properties match { - case tbl: SqlTableInferrerProperties => + case tbl: SqlTableInferrerInput => val tipe = jdbcInferrer.getTableType(tbl.location) - SqlTableInputFormatDescriptor(tipe) - case query: SqlQueryInferrerProperties => + SqlTableInferrerOutput(tipe) + case query: SqlQueryInferrerInput => val tipe = jdbcInferrer.getQueryType(query.location, query.sql) - SqlQueryInputFormatDescriptor(tipe) - case csv: CsvInferrerProperties => + SqlQueryInferrerOutput(tipe) + case csv: CsvInferrerInput => val is = textInputStream(csv.location) try { csvInferrer.infer( @@ -92,7 +92,7 @@ class LocalInferrerService(implicit settings: RawSettings) } finally { is.close() } - case csv: ManyCsvInferrerProperties => + case csv: ManyCsvInferrerInput => val files = csv.location.ls() readMany( files, @@ -117,14 +117,14 @@ class LocalInferrerService(implicit settings: RawSettings) } } ) - case hjson: HjsonInferrerProperties => + case hjson: HjsonInferrerInput => val is = textInputStream(hjson.location) try { hjsonInferrer.infer(is, hjson.maybeEncoding, hjson.maybeSampleSize) } finally { is.close() } - case hjson: ManyHjsonInferrerProperties => + case hjson: ManyHjsonInferrerInput => val files = hjson.location.ls() readMany( files, @@ -138,14 +138,14 @@ class LocalInferrerService(implicit settings: RawSettings) } } ) - case json: JsonInferrerProperties => + case json: JsonInferrerInput => val is = textInputStream(json.location) try { jsonInferrer.infer(is, json.maybeEncoding, json.maybeSampleSize) } finally { is.close() } - case json: ManyJsonInferrerProperties => + case json: ManyJsonInferrerInput => val files = json.location.ls() readMany( files, @@ -159,14 +159,14 @@ class LocalInferrerService(implicit settings: RawSettings) } } ) - case xml: XmlInferrerProperties => + case xml: XmlInferrerInput => val is = textInputStream(xml.location) try { xmlInferrer.infer(is, xml.maybeEncoding, xml.maybeSampleSize) } finally { is.close() } - case xml: ManyXmlInferrerProperties => + case xml: ManyXmlInferrerInput => val files = xml.location.ls() readMany( files, @@ -180,14 +180,14 @@ class LocalInferrerService(implicit settings: RawSettings) } } ) - case auto: AutoInferrerProperties => auto.location match { + case auto: AutoInferrerInput => auto.location match { case bs: ByteStreamLocation => autoInferrer.infer(bs, auto.maybeSampleSize) case tbl: JdbcTableLocation => val tipe = jdbcInferrer.getTableType(tbl) - SqlTableInputFormatDescriptor(tipe) + SqlTableInferrerOutput(tipe) case _ => throw new LocalInferrerException("unsupported location for auto inference") } - case auto: ManyAutoInferrerProperties => + case auto: ManyAutoInferrerInput => val files = auto.location.ls() readMany(files, auto.maybeSampleFiles, file => autoInferrer.infer(file, auto.maybeSampleSize)) } @@ -212,8 +212,8 @@ class LocalInferrerService(implicit settings: RawSettings) private def readMany( locations: Iterator[ByteStreamLocation], maybeSampleFiles: Option[Int], - doInference: ByteStreamLocation => InputFormatDescriptor - ): InputFormatDescriptor = { + doInference: ByteStreamLocation => InferrerOutput + ): InferrerOutput = { if (!locations.hasNext) { throw new LocalInferrerException("location is empty") } @@ -254,117 +254,116 @@ class LocalInferrerService(implicit settings: RawSettings) } private def mergeDescriptors( - l: Seq[InputFormatDescriptor] - ): InputFormatDescriptor = { + l: Seq[InferrerOutput] + ): InferrerOutput = { l.tail.foldLeft(l.head)((acc, desc) => mergeDescriptors(acc, desc)) } - private def mergeDescriptors(x: InputFormatDescriptor, y: InputFormatDescriptor): InputFormatDescriptor = - (x, y) match { - case ( - TextInputStreamFormatDescriptor(ec1, conf1, format1), - TextInputStreamFormatDescriptor(ec2, conf2, format2) - ) => - val (encoding, confidence) = - if (conf1 > conf2) (ec1, conf1) - else (ec2, conf2) + private def mergeDescriptors(x: InferrerOutput, y: InferrerOutput): InferrerOutput = (x, y) match { + case ( + TextInputStreamInferrerOutput(ec1, conf1, format1), + TextInputStreamInferrerOutput(ec2, conf2, format2) + ) => + val (encoding, confidence) = + if (conf1 > conf2) (ec1, conf1) + else (ec2, conf2) - if (ec1 != ec2) { - logger.debug( - s"Detected different encodings: $ec1 (confidence: $conf1); $ec2 (confidence: $conf2). Choosing $encoding." - ) - } + if (ec1 != ec2) { + logger.debug( + s"Detected different encodings: $ec1 (confidence: $conf1); $ec2 (confidence: $conf2). Choosing $encoding." + ) + } - val merge = (format1, format2) match { - case ( - JsonInputFormatDescriptor(t1, sp1, tf1, df1, tsf1), - JsonInputFormatDescriptor(t2, sp2, tf2, df2, tsf2) - ) => - if (tf1 != tf2 || df1 != df2 || tsf1 != tsf2) - throw new LocalInferrerException("incompatible json files found") + val merge = (format1, format2) match { + case ( + JsonFormatDescriptor(t1, sp1, tf1, df1, tsf1), + JsonFormatDescriptor(t2, sp2, tf2, df2, tsf2) + ) => + if (tf1 != tf2 || df1 != df2 || tsf1 != tsf2) + throw new LocalInferrerException("incompatible json files found") - JsonInputFormatDescriptor(MergeTypes.maxOf(t1, t2), sp1 || sp2, tf1, df1, tsf1) - case ( - XmlInputFormatDescriptor(t1, sampled1, tf1, df1, tsf1), - XmlInputFormatDescriptor(t2, sampled2, tf2, df2, tsf2) - ) => - if (tf1 != tf2 || df1 != df2 || tsf1 != tsf2) - throw new LocalInferrerException("incompatible json files found") - XmlInputFormatDescriptor(XmlMergeTypes.maxOf(t1, t2), sampled1 || sampled2, tf1, df1, tsf1) - case ( - HjsonInputFormatDescriptor(t1, sp1, tf1, df1, tsf1), - HjsonInputFormatDescriptor(t2, sp2, tf2, df2, tsf2) - ) => - if (tf1 != tf2 || df1 != df2 || tsf1 != tsf2) - throw new LocalInferrerException("incompatible hjson files found") + JsonFormatDescriptor(MergeTypes.maxOf(t1, t2), sp1 || sp2, tf1, df1, tsf1) + case ( + XmlFormatDescriptor(t1, sampled1, tf1, df1, tsf1), + XmlFormatDescriptor(t2, sampled2, tf2, df2, tsf2) + ) => + if (tf1 != tf2 || df1 != df2 || tsf1 != tsf2) + throw new LocalInferrerException("incompatible json files found") + XmlFormatDescriptor(XmlMergeTypes.maxOf(t1, t2), sampled1 || sampled2, tf1, df1, tsf1) + case ( + HjsonFormatDescriptor(t1, sp1, tf1, df1, tsf1), + HjsonFormatDescriptor(t2, sp2, tf2, df2, tsf2) + ) => + if (tf1 != tf2 || df1 != df2 || tsf1 != tsf2) + throw new LocalInferrerException("incompatible hjson files found") - HjsonInputFormatDescriptor(MergeTypes.maxOf(t1, t2), sp1 || sp2, tf1, df1, tsf1) - case (LinesInputFormatDescriptor(t1, r1, sp1), LinesInputFormatDescriptor(t2, r2, sp2)) => - // if the regexes are not the same then it defaults to simple text without a regex - if (r1 == r2) LinesInputFormatDescriptor(MergeTypes.maxOf(t1, t2), r1, sp1 || sp2) - else LinesInputFormatDescriptor(SourceCollectionType(SourceStringType(false), false), None, sp1 || sp2) - case ( - CsvInputFormatDescriptor( - t1, - hasHeader1, - sep1, - nulls1, - multiline1, - nans1, - skip1, - escape1, - quote1, - sampled1, - tf1, - df1, - tsf1 - ), - CsvInputFormatDescriptor( - t2, - hasHeader2, - sep2, - nulls2, - multiline2, - nans2, - skip2, - escape2, - quote2, - sampled2, - tf2, - df2, - tsf2 - ) - ) => - if ( - sep1 != sep2 || nulls1 != nulls2 || nans1 != nans2 || hasHeader1 != hasHeader2 || skip1 != skip2 || escape1 != escape2 || quote1 != quote2 - ) { - throw new LocalInferrerException("incompatible CSV files found") - } - val t = CsvMergeTypes.maxOf(t1, t2) - t match { - case SourceCollectionType(SourceRecordType(_, _), _) => CsvInputFormatDescriptor( - t, - hasHeader1, - sep1, - nulls1, - multiline1 || multiline2, - nans1, - skip1, - escape1, - quote1, - sampled1 || sampled2, - if (tf1 == tf2) tf1 else None, - if (df1 == df2) df1 else None, - if (tsf1 == tsf2) tsf1 else None - ) - case _ => throw new LocalInferrerException("incompatible CSV files found") - } + HjsonFormatDescriptor(MergeTypes.maxOf(t1, t2), sp1 || sp2, tf1, df1, tsf1) + case (LinesFormatDescriptor(t1, r1, sp1), LinesFormatDescriptor(t2, r2, sp2)) => + // if the regexes are not the same then it defaults to simple text without a regex + if (r1 == r2) LinesFormatDescriptor(MergeTypes.maxOf(t1, t2), r1, sp1 || sp2) + else LinesFormatDescriptor(SourceCollectionType(SourceStringType(false), false), None, sp1 || sp2) + case ( + CsvFormatDescriptor( + t1, + hasHeader1, + sep1, + nulls1, + multiline1, + nans1, + skip1, + escape1, + quote1, + sampled1, + tf1, + df1, + tsf1 + ), + CsvFormatDescriptor( + t2, + hasHeader2, + sep2, + nulls2, + multiline2, + nans2, + skip2, + escape2, + quote2, + sampled2, + tf2, + df2, + tsf2 + ) + ) => + if ( + sep1 != sep2 || nulls1 != nulls2 || nans1 != nans2 || hasHeader1 != hasHeader2 || skip1 != skip2 || escape1 != escape2 || quote1 != quote2 + ) { + throw new LocalInferrerException("incompatible CSV files found") + } + val t = CsvMergeTypes.maxOf(t1, t2) + t match { + case SourceCollectionType(SourceRecordType(_, _), _) => CsvFormatDescriptor( + t, + hasHeader1, + sep1, + nulls1, + multiline1 || multiline2, + nans1, + skip1, + escape1, + quote1, + sampled1 || sampled2, + if (tf1 == tf2) tf1 else None, + if (df1 == df2) df1 else None, + if (tsf1 == tsf2) tsf1 else None + ) + case _ => throw new LocalInferrerException("incompatible CSV files found") + } - // Defaults to lines of text if nothing else - case _ => LinesInputFormatDescriptor(SourceCollectionType(SourceStringType(false), false), None, false) - } - TextInputStreamFormatDescriptor(encoding, confidence, merge) - case _ => throw new LocalInferrerException(s"incompatible formats found") - } + // Defaults to lines of text if nothing else + case _ => LinesFormatDescriptor(SourceCollectionType(SourceStringType(false), false), None, false) + } + TextInputStreamInferrerOutput(encoding, confidence, merge) + case _ => throw new LocalInferrerException(s"incompatible formats found") + } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala index 87fbbd8a5..2bf68df39 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/MergeTypes.scala @@ -59,8 +59,8 @@ private[inferrer] trait MergeTypes extends StrictLogging { // TODO: The following doesn't handle temporal types since this hasn't been needed so far... protected def l4TypesMaxOf(t1: SourceNullableType, t2: SourceNullableType): SourceType = { (t1, t2) match { - case (_: SourceNullType, _) => SourceNullableType.cloneAsNullable(t2) - case (_, _: SourceNullType) => SourceNullableType.cloneAsNullable(t1) + case (_: SourceNullType, _) => SourceNullableType.setNullableShallowClone(t2) + case (_, _: SourceNullType) => SourceNullableType.setNullableShallowClone(t1) case (r1: SourceRecordType, r2: SourceRecordType) => maxOfRecord(r1, r2) case (_: SourceRecordType, _) | (_, _: SourceRecordType) => SourceOrType(Set(t1, t2)) case (SourceCollectionType(i1, n1), SourceCollectionType(i2, n2)) => SourceCollectionType(maxOf(i1, i2), n1 || n2) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala index b58d9b8d2..32b90cee1 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/auto/AutoInferrer.scala @@ -42,7 +42,7 @@ class AutoInferrer( import AutoInferrer._ - def infer(location: ByteStreamLocation, maybeSampleSize: Option[Int]): InputStreamFormatDescriptor = { + def infer(location: ByteStreamLocation, maybeSampleSize: Option[Int]): InputStreamInferrerOutput = { location match { case fs: FileSystemLocation => // If it is a file system, check if it is a directory, to attempt to detect Hadoop-like files. @@ -62,7 +62,7 @@ class AutoInferrer( private def inferTextFormats( location: ByteStreamLocation, maybeSampleSize: Option[Int] - ): TextInputStreamFormatDescriptor = { + ): TextInputStreamInferrerOutput = { // Will try multiple inferrers in turn // The current code instantiates a decoded stream of Char and passes // it to several text format inferrers. If needed to try inferrers in @@ -82,11 +82,11 @@ class AutoInferrer( // TODO (ctm): Probably rely on r.charsetConfidence as well? def tryReaderInfer( format: String, - f: Reader => TextInputFormatDescriptor - ): Either[String, TextInputStreamFormatDescriptor] = { + f: Reader => TextFormatDescriptor + ): Either[String, TextInputStreamInferrerOutput] = { is.seek(0) val reader = getReader(is, encoding) - tryInfer(format, TextInputStreamFormatDescriptor(encoding, confidence, f(reader))) + tryInfer(format, TextInputStreamInferrerOutput(encoding, confidence, f(reader))) } // for json, hjson and csv making prefer_nulls = true @@ -97,7 +97,7 @@ class AutoInferrer( // Check whether it is a text file with a known regex val resText = tryReaderInfer("text", reader => textInferrer.infer(reader, maybeSampleSize)) resText match { - case Right(TextInputStreamFormatDescriptor(_, _, LinesInputFormatDescriptor(_, Some(_), _))) => + case Right(TextInputStreamInferrerOutput(_, _, LinesFormatDescriptor(_, Some(_), _))) => // Found a meaningful text with regex, so accept it resText case _ => @@ -119,10 +119,10 @@ class AutoInferrer( ) resCsv match { case Right( - TextInputStreamFormatDescriptor( + TextInputStreamInferrerOutput( _, _, - CsvInputFormatDescriptor( + CsvFormatDescriptor( SourceCollectionType(SourceRecordType(atts, false), false), hasHeader, _, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala index 3cef78292..6ee5f2b93 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/csv/CsvInferrer.scala @@ -55,7 +55,7 @@ class CsvInferrer(implicit protected val settings: RawSettings) skip: Option[Int], maybeEscapeChar: Option[Char], maybeQuoteChars: Option[Seq[Option[Char]]] - ): TextInputStreamFormatDescriptor = { + ): TextInputStreamInferrerOutput = { val r = getTextBuffer(is, maybeEncoding) try { val format = infer( @@ -69,7 +69,7 @@ class CsvInferrer(implicit protected val settings: RawSettings) maybeEscapeChar, maybeQuoteChars ) - TextInputStreamFormatDescriptor(r.encoding, r.confidence, format) + TextInputStreamInferrerOutput(r.encoding, r.confidence, format) } catch { case ex: RawException => throw ex case NonFatal(e) => throw new RawException(s"csv inference failed unexpectedly", e) @@ -88,7 +88,7 @@ class CsvInferrer(implicit protected val settings: RawSettings) skip: Option[Int], maybeEscapeChar: Option[Char], maybeQuoteChars: Option[Seq[Option[Char]]] - ): TextInputFormatDescriptor = { + ): TextFormatDescriptor = { val delimiters = maybeDelimiters.getOrElse(defaultDelimiters) val nulls = maybeNulls.getOrElse(Seq("")) @@ -137,7 +137,7 @@ class CsvInferrer(implicit protected val settings: RawSettings) val (result, hasHeader) = sniffer.infer(maybeHasHeader) val linesToSkip = (if (hasHeader) 1 else 0) + skip.getOrElse(0) - CsvInputFormatDescriptor( + CsvFormatDescriptor( result.cleanedType, hasHeader = hasHeader, delimiter = sniffer.delimiter, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala index d85eff3b2..7453d017d 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/hjson/HjsonInferrer.scala @@ -42,10 +42,10 @@ class HjsonInferrer(implicit protected val settings: RawSettings) is: SeekableInputStream, maybeEncoding: Option[Encoding], maybeSampleSize: Option[Int] - ): TextInputStreamFormatDescriptor = { + ): TextInputStreamInferrerOutput = { val r = getTextBuffer(is, maybeEncoding) try { - TextInputStreamFormatDescriptor(r.encoding, r.confidence, infer(r.reader, maybeSampleSize)) + TextInputStreamInferrerOutput(r.encoding, r.confidence, infer(r.reader, maybeSampleSize)) } catch { case ex: RawException => throw ex case NonFatal(e) => throw new RawException(s"hjson inference failed unexpectedly", e) @@ -54,7 +54,7 @@ class HjsonInferrer(implicit protected val settings: RawSettings) } } - def infer(reader: Reader, maybeSampleSize: Option[Int]): TextInputFormatDescriptor = { + def infer(reader: Reader, maybeSampleSize: Option[Int]): TextFormatDescriptor = { try { val sampleSize = maybeSampleSize.getOrElse(defaultSampleSize) val nObjs = if (sampleSize <= 0) Int.MaxValue else sampleSize @@ -84,7 +84,7 @@ class HjsonInferrer(implicit protected val settings: RawSettings) } val result = uniquifyTemporalFormats(innerType) - HjsonInputFormatDescriptor( + HjsonFormatDescriptor( SourceCollectionType(result.cleanedType, false), it.hasNext, result.timeFormat, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala index 1cf8c8da6..3a7903a12 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/json/JsonInferrer.scala @@ -42,11 +42,11 @@ class JsonInferrer(implicit protected val settings: RawSettings) is: SeekableInputStream, maybeEncoding: Option[Encoding], maybeSampleSize: Option[Int] - ): TextInputStreamFormatDescriptor = { + ): TextInputStreamInferrerOutput = { val buffer = getTextBuffer(is, maybeEncoding) try { val result = infer(buffer.reader, maybeSampleSize) - TextInputStreamFormatDescriptor(buffer.encoding, buffer.confidence, result) + TextInputStreamInferrerOutput(buffer.encoding, buffer.confidence, result) } catch { case ex: RawException => throw ex case NonFatal(e) => throw new RawException(s"json inference failed unexpectedly", e) @@ -55,7 +55,7 @@ class JsonInferrer(implicit protected val settings: RawSettings) } } - def infer(reader: Reader, maybeSampleSize: Option[Int]): TextInputFormatDescriptor = { + def infer(reader: Reader, maybeSampleSize: Option[Int]): TextFormatDescriptor = { try { var nobjs = maybeSampleSize.getOrElse(defaultSampleSize) // if you define a sample-size < 0 then it will read the full file @@ -84,7 +84,7 @@ class JsonInferrer(implicit protected val settings: RawSettings) throw new LocalInferrerException("unexpected token after object in JSON") } val result = uniquifyTemporalFormats(tipe) - JsonInputFormatDescriptor( + JsonFormatDescriptor( result.cleanedType, !eof, result.timeFormat, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala index 48e446f33..0339079cf 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/text/TextInferrer.scala @@ -45,10 +45,10 @@ class TextInferrer(implicit protected val settings: RawSettings) is: SeekableInputStream, maybeEncoding: Option[Encoding], maybeSampleSize: Option[Int] - ): TextInputStreamFormatDescriptor = { + ): TextInputStreamInferrerOutput = { val r = getTextBuffer(is, maybeEncoding) try { - TextInputStreamFormatDescriptor(r.encoding, r.confidence, infer(r.reader, maybeSampleSize)) + TextInputStreamInferrerOutput(r.encoding, r.confidence, infer(r.reader, maybeSampleSize)) } catch { case ex: RawException => throw ex case NonFatal(e) => throw new RawException(s"text inference failed unexpectedly", e) @@ -57,7 +57,7 @@ class TextInferrer(implicit protected val settings: RawSettings) } } - def infer(reader: Reader, maybeSampleSize: Option[Int]): TextInputFormatDescriptor = { + def infer(reader: Reader, maybeSampleSize: Option[Int]): TextFormatDescriptor = { var count = 0 val sampleSize = maybeSampleSize.getOrElse(defaultSampleSize) val nObjs = if (sampleSize <= 0) Int.MaxValue else sampleSize @@ -87,11 +87,11 @@ class TextInferrer(implicit protected val settings: RawSettings) if (value < minMatch) { val innerType = SourceStringType(false) val tipe = SourceCollectionType(innerType, false) - LinesInputFormatDescriptor(tipe, None, false) + LinesFormatDescriptor(tipe, None, false) } else { val innerType = SourceRecordType(choice.atts.toVector, true) val tipe = SourceCollectionType(innerType, false) - LinesInputFormatDescriptor(tipe, Some(choice.regex.regex), it.hasNext) + LinesFormatDescriptor(tipe, Some(choice.regex.regex), it.hasNext) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala index b880329ae..c2dd2fa47 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/InferrerXmlTypeReader.scala @@ -109,7 +109,8 @@ private[xml] class InferrerXmlTypeReader(reader: Reader, maxRepeatedTags: Int) def getTypeFromAtts(atts: Vector[SourceAttrType]) = { atts.find(att => att.idn == idn).map(_.tipe).getOrElse(SourceNothingType()) match { case t: SourcePrimitiveType => t - case SourceCollectionType(t: SourcePrimitiveType, n) => SourceNullableType.cloneNullable(t, t.nullable || n) + case SourceCollectionType(t: SourcePrimitiveType, n) => + SourceNullableType.setNullableShallowClone(t, t.nullable || n) case _ => SourceNothingType() } } @@ -181,7 +182,8 @@ private[xml] class InferrerXmlTypeReader(reader: Reader, maxRepeatedTags: Int) val fieldType = currentType match { case t: SourcePrimitiveType => t case record: SourceRecordType => getCurrentTypeOfTextField(TEXT_FIELD_NAME, record) - case SourceCollectionType(t: SourcePrimitiveType, n) => SourceNullableType.cloneNullable(t, t.nullable || n) + case SourceCollectionType(t: SourcePrimitiveType, n) => + SourceNullableType.setNullableShallowClone(t, t.nullable || n) case _ => SourceNothingType() } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala index 7396525a8..2e6754915 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlInferrer.scala @@ -41,10 +41,10 @@ class XmlInferrer(implicit protected val settings: RawSettings) is: SeekableInputStream, maybeEncoding: Option[Encoding], maybeSampleSize: Option[Int] - ): TextInputStreamFormatDescriptor = { + ): TextInputStreamInferrerOutput = { val r = getTextBuffer(is, maybeEncoding) try { - TextInputStreamFormatDescriptor(r.encoding, r.confidence, infer(r.reader, maybeSampleSize)) + TextInputStreamInferrerOutput(r.encoding, r.confidence, infer(r.reader, maybeSampleSize)) } catch { case ex: RawException => throw ex case NonFatal(e) => throw new RawException(s"xml inference failed unexpectedly", e) @@ -53,7 +53,7 @@ class XmlInferrer(implicit protected val settings: RawSettings) } } - def infer(reader: Reader, maybeSampleSize: Option[Int]): TextInputFormatDescriptor = { + def infer(reader: Reader, maybeSampleSize: Option[Int]): TextFormatDescriptor = { try { var nobjs = maybeSampleSize.getOrElse(defaultSampleSize) if (nobjs < 0) { @@ -71,7 +71,7 @@ class XmlInferrer(implicit protected val settings: RawSettings) val result = xmlReader.uniquifyTemporalFormats(innerType) // If multiple top-level XML documents, make it a collection. val tipe = if (count > 1) SourceCollectionType(result.cleanedType, false) else result.cleanedType - XmlInputFormatDescriptor(tipe, xmlReader.sampled, result.timeFormat, result.dateFormat, result.timestampFormat) + XmlFormatDescriptor(tipe, xmlReader.sampled, result.timeFormat, result.dateFormat, result.timestampFormat) } catch { case ex: XMLStreamException => val col = ex.getLocation.getColumnNumber diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala index 725fb36b2..107e6def1 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/xml/XmlMergeTypes.scala @@ -93,7 +93,7 @@ private[inferrer] trait XmlMergeTypes extends MergeTypes { // When a field is found only in one record we consider it was null, which makes the field nullable. // If that field is known to be a collection, we consider the absence of the field is only an empty list. case n: SourceCollectionType => n - case n: SourceNullableType => SourceNullableType.cloneAsNullable(n) + case n: SourceNullableType => SourceNullableType.setNullableShallowClone(n) case t => t } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala index 23dedc993..5fc82c7be 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala @@ -15,11 +15,11 @@ package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.util.Entity -import com.rawlabs.snapi.frontend.base.{ExpectedType, MultipleEntity, TreeDescription, UnknownEntity} +import com.rawlabs.snapi.frontend.base.{MultipleEntity, TreeDescription, UnknownEntity} import com.rawlabs.snapi.frontend.base import com.rawlabs.snapi.frontend.base.source._ import com.rawlabs.snapi.frontend.base.errors._ -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.mutable @@ -67,7 +67,6 @@ abstract class CommonSemanticAnalyzer(tree: SourceTree.SourceTree)( } protected def defentity(i: IdnDef): Entity = i match { - case tree.parent(b: Bind) => new BindEntity(b) case tree.parent(p: SourceProgramParam) => new ProgramParamEntity(p) case _ => throw new AssertionError(s"Unhandled node in defentity: ${tree.parent(i).toString}") } @@ -83,7 +82,6 @@ abstract class CommonSemanticAnalyzer(tree: SourceTree.SourceTree)( } override protected def entityTypeDef(e: Entity): Type = e match { - case i: BindEntity => actualType(i.b.e) case p: ProgramParamEntity => p.p.t case UnknownEntity() | _: MultipleEntity => ErrorType() } @@ -99,14 +97,13 @@ abstract class CommonSemanticAnalyzer(tree: SourceTree.SourceTree)( case n: IdnUse => lookup(env(n), n.idn, UnknownEntity()) } - override protected def expectedTypeDef(n: Exp): ExpectedType = n match { - case tree.parent.pair(e: Exp, parent: CommonNode) => expectedTypeCommon(e, parent) - case _ => super.expectedTypeDef(n) - } - - private def expectedTypeCommon(e: Exp, parent: CommonNode): Type = (parent: @unchecked) match { - case Bind(_, _) => anything - } +// override protected def expectedTypeDef(n: Exp): ExpectedType = n match { +// case tree.parent.pair(e: Exp, parent: CommonNode) => expectedTypeCommon(e, parent) +// case _ => super.expectedTypeDef(n) +// } +// +// private def expectedTypeCommon(e: Exp, parent: CommonNode): Type = (parent: @unchecked) match { +// } protected def envInOfNode(n: SourceNode): Environment = env.in(n) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala index bf6f96c94..64633c48e 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala @@ -17,8 +17,8 @@ import org.bitbucket.inkytonik.kiama.util.Positions import com.rawlabs.snapi.frontend.base.SyntaxAnalyzer.identRegex import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import com.rawlabs.snapi.frontend.rql2.source._ import scala.util.matching.Regex diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/CompilerLspService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/LspAnalyzer.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/CompilerLspService.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/LspAnalyzer.scala index 0a8a17fb7..12c5a5756 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/CompilerLspService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/LspAnalyzer.scala @@ -10,9 +10,8 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.lsp +package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.compiler import com.rawlabs.compiler.{ AutoCompleteResponse, Completion, @@ -39,20 +38,20 @@ import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} import com.rawlabs.snapi.frontend.base.errors.CompilationMessageMapper import com.rawlabs.snapi.frontend.base.source.{BaseIdnNode, BaseNode} -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.errors.ErrorsPrettyPrinter import scala.util.Try -class CompilerLspService( +class LspAnalyzer( parseErrors: List[Message], analyzer: SemanticAnalyzer, positions: Positions )(implicit programContext: ProgramContext) extends StrictLogging { + import LspAnalyzer._ + private def getNodesAtPosition( position: Position ): Vector[BaseNode] = { @@ -84,7 +83,7 @@ class CompilerLspService( .asInstanceOf[Completion] } } - CompilerLspService.existingTypes + existingTypes .filter(_.startsWith(prefix)) .map(t => TypeCompletion(t, "").asInstanceOf[Completion]) ++ typeAliases } @@ -490,8 +489,8 @@ class CompilerLspService( } } -object CompilerLspService { - private def existingTypes = Array( +object LspAnalyzer { + private val existingTypes = Array( "byte", "short", "int", diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PhaseDescriptor.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PhaseDescriptor.scala index 81644822b..07d2cb0ed 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/common/PhaseDescriptor.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PhaseDescriptor.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.common +package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ final case class PhaseDescriptor( name: String, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala index 9d49742f2..ad97eef6b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala @@ -12,7 +12,7 @@ package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source.SourceProgram +import com.rawlabs.snapi.frontend.rql2.source.SourceProgram trait PipelinedPhase extends com.rawlabs.snapi.frontend.base.PipelinedPhase[SourceProgram] diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala index 2fdef57ab..31f37f826 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala @@ -12,24 +12,29 @@ package com.rawlabs.snapi.frontend.rql2 +import com.rawlabs.compiler.ProgramEnvironment +import com.rawlabs.snapi.frontend.base.CompilerContext import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage -import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, PackageExtensionProvider, Rql2Value} +import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, PackageExtensionProvider} import com.rawlabs.snapi.frontend.rql2.source.Rql2Program -import com.rawlabs.snapi.frontend.inferrer.api.{InferrerProperties, InputFormatDescriptor} +import com.rawlabs.snapi.frontend.inferrer.api.{InferrerInput, InferrerOutput} import scala.collection.mutable -trait ProgramContext extends com.rawlabs.snapi.frontend.base.ProgramContext { +class ProgramContext( + override val programEnvironment: ProgramEnvironment, + override val compilerContext: CompilerContext +) extends com.rawlabs.snapi.frontend.base.ProgramContext { - private val inferCache = new mutable.HashMap[InferrerProperties, Either[String, InputFormatDescriptor]] + private val inferCache = new mutable.HashMap[InferrerInput, Either[String, InferrerOutput]] private val dynamicPackageCache = new mutable.HashMap[String, PackageExtension] private val stageCompilerCache = new mutable.HashMap[Rql2Program, Either[ErrorCompilerMessage, Rql2Value]] def infer( - inferrerProperties: InferrerProperties - ): Either[String, InputFormatDescriptor] = { + inferrerProperties: InferrerInput + ): Either[String, InferrerOutput] = { inferCache.getOrElseUpdate( inferrerProperties, compilerContext.infer(inferrerProperties) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala deleted file mode 100644 index 0931b5e50..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2ProgramContext.scala +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2 - -import com.rawlabs.compiler.ProgramEnvironment -import com.rawlabs.snapi.frontend.base.CompilerContext - -class Rql2ProgramContext( - override val programEnvironment: ProgramEnvironment, - override val compilerContext: CompilerContext -) extends ProgramContext diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala index d63dec30c..7459f9e27 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala @@ -37,37 +37,17 @@ import com.rawlabs.compiler.{ } import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api.{ - Rql2BoolValue, - Rql2ByteValue, - Rql2DateValue, - Rql2DoubleValue, - Rql2FloatValue, - Rql2IntValue, - Rql2IntervalValue, - Rql2ListValue, - Rql2LongValue, - Rql2OptionValue, - Rql2RecordAttr, - Rql2RecordValue, - Rql2ShortValue, - Rql2StringValue, - Rql2TimeValue, - Rql2TimestampValue, - Rql2Value -} -import com.rawlabs.snapi.frontend.rql2.builtin.{ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalPackageBuilder +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ DatePackageBuilder, - IntervalPackageBuilder, ListPackageBuilder, NullablePackageBuilder, RecordPackageBuilder, TimePackageBuilder, TimestampPackageBuilder } -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.inferrer.api._ trait Rql2TypeUtils { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/Values.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/Values.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala index 1c24228d7..9705e97f1 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/Values.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.api +package com.rawlabs.snapi.frontend.rql2 import com.rawlabs.utils.sources.api.Location diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala index b3226b907..418cfb872 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala @@ -19,22 +19,18 @@ import org.bitbucket.inkytonik.kiama.util.Entity import com.rawlabs.snapi.frontend.base._ import com.rawlabs.snapi.frontend.base.errors._ import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtensionProvider, - Rql2OptionValue, - Rql2TryValue, - Rql2Value, TypeArg, TypeParam, ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.builtin.TypePackageBuilder import com.rawlabs.snapi.frontend.rql2.errors.{ CannotDetermineTypeOfParameter, ExpectedTypeButGotExpression, @@ -52,6 +48,7 @@ import com.rawlabs.snapi.frontend.rql2.errors.{ UnexpectedArguments, UnexpectedOptionalArgument } +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypePackageBuilder import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala index 68a366f97..ea4565ddc 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala @@ -17,7 +17,7 @@ import com.rawlabs.utils.core.RawSettings import org.graalvm.polyglot.{Context, PolyglotAccess, PolyglotException, Source, Value} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2.antlr4.ParserErrors -import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.extensions._ import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala index 87662f036..f00a4a564 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala @@ -14,19 +14,13 @@ package com.rawlabs.snapi.frontend.rql2 import org.bitbucket.inkytonik.kiama.util.Entity import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api.PackageExtension +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.PackageExtension import com.rawlabs.snapi.frontend.rql2.source._ /** Entity for a program parameter. */ final class ProgramParamEntity(val p: SourceProgramParam) extends Entity -/** - * Entity for a bound identifier. - * TODO (msb): Move out of common onto L4 + core. - */ -final class BindEntity(val b: Bind) extends Entity - trait SymbolTable extends base.SymbolTable object SymbolTable extends SymbolTable diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala index ccd6fb79b..87cf968a3 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala @@ -17,8 +17,8 @@ import org.bitbucket.inkytonik.kiama.util.Positions import com.rawlabs.snapi.frontend.base.SyntaxAnalyzer.identRegex import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import com.rawlabs.snapi.frontend.rql2.source._ import scala.util.matching.Regex diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala index 72ed11987..5fe821766 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala @@ -12,7 +12,7 @@ package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.source.InternalSourcePrettyPrinter class Tree(originalRoot: SourceProgram, ensureTree: Boolean = true)( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala index 63bfe115a..50eb670f8 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala @@ -12,7 +12,7 @@ package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult} class TreeWithPositions(originalSource: String, ensureTree: Boolean = true, frontend: Boolean = false)( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala index 8b28e30d9..d0a14d7ab 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala @@ -18,7 +18,7 @@ import org.antlr.v4.runtime.{CharStreams, CommonTokenStream, TokenStream} import org.bitbucket.inkytonik.kiama.parsing.Parsers import org.bitbucket.inkytonik.kiama.util.{Positions, Source, StringSource} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source.SourceProgram +import com.rawlabs.snapi.frontend.rql2.source.SourceProgram import com.rawlabs.snapi.parser.generated.{SnapiLexer, SnapiParser} import com.rawlabs.snapi.frontend.rql2.source.Rql2Program @@ -33,7 +33,7 @@ final case class ParseTypeResult(errors: List[Message], tipe: Type) extends Pars class Antlr4SyntaxAnalyzer(val positions: Positions, isFrontend: Boolean) extends Parsers(positions) { def parse(s: String): ParseProgramResult[SourceProgram] = { - val rawErrorListener = new RawErrorListener() + val rawErrorListener = new Rql2ErrorListener() val stream = getTokenStream(s, rawErrorListener) parse(stream, StringSource(s), rawErrorListener) } @@ -41,22 +41,22 @@ class Antlr4SyntaxAnalyzer(val positions: Positions, isFrontend: Boolean) extend protected def parse( stream: TokenStream, source: Source, - errorListener: RawErrorListener + errorListener: Rql2ErrorListener ): ParseProgramResult[SourceProgram] = { val parser = new SnapiParser(stream) parser.removeErrorListeners() parser.addErrorListener(errorListener) val tree: ParseTree = parser.prog - val visitorParseErrors = RawVisitorParseErrors() - val visitor = new RawSnapiVisitor(positions, source, isFrontend, visitorParseErrors) + val visitorParseErrors = new Rql2VisitorParseErrors + val visitor = new Rql2SnapiVisitor(positions, source, isFrontend, visitorParseErrors) val result = visitor.visit(tree).asInstanceOf[Rql2Program] val totalErrors = errorListener.getErrors ++ visitorParseErrors.getErrors ParseProgramResult(totalErrors, result) } - protected def getTokenStream(s: String, errorListener: RawErrorListener): CommonTokenStream = { + protected def getTokenStream(s: String, errorListener: Rql2ErrorListener): CommonTokenStream = { val lexer = new SnapiLexer(CharStreams.fromString(s)) lexer.removeErrorListeners() lexer.addErrorListener(errorListener) @@ -66,15 +66,15 @@ class Antlr4SyntaxAnalyzer(val positions: Positions, isFrontend: Boolean) extend def parseType(s: String): ParseTypeResult = { val source = StringSource(s) - val rawErrorListener = new RawErrorListener() + val rawErrorListener = new Rql2ErrorListener() val parser = new SnapiParser(getTokenStream(s, rawErrorListener)) parser.removeErrorListeners() parser.addErrorListener(rawErrorListener) val tree: ParseTree = parser.tipe - val visitorParseErrors = RawVisitorParseErrors() - val visitor: RawSnapiVisitor = new RawSnapiVisitor(positions, source, isFrontend, visitorParseErrors) + val visitorParseErrors = new Rql2VisitorParseErrors + val visitor: Rql2SnapiVisitor = new Rql2SnapiVisitor(positions, source, isFrontend, visitorParseErrors) val result: Type = visitor.visit(tree).asInstanceOf[Type] val totalErrors = rawErrorListener.getErrors ++ visitorParseErrors.getErrors diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala index f49e61cef..fd73f1705 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala @@ -14,7 +14,7 @@ package com.rawlabs.snapi.frontend.rql2.antlr4 import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} import com.rawlabs.snapi.frontend.base.source.{BaseNode, BaseProgram} -import com.rawlabs.snapi.frontend.common.source.SourceProgram +import com.rawlabs.snapi.frontend.rql2.source.SourceProgram import java.util import scala.collection.JavaConverters._ @@ -28,7 +28,7 @@ class CommentsAntlrSyntaxAnalyzer( ) extends Antlr4SyntaxAnalyzer(positions, isFrontend) { override def parse(s: String): ParseProgramResult[SourceProgram] = { - val rawErrorListener = new RawErrorListener() + val rawErrorListener = new Rql2ErrorListener() val source = StringSource(s) val stream = getTokenStream(s, rawErrorListener) val r = parse(stream, source, rawErrorListener) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawErrorListener.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2ErrorListener.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawErrorListener.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2ErrorListener.scala index 7b6c65be9..04088fbf7 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawErrorListener.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2ErrorListener.scala @@ -15,9 +15,11 @@ package com.rawlabs.snapi.frontend.rql2.antlr4 import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange, Message} import org.antlr.v4.runtime.{BaseErrorListener, RecognitionException, Recognizer, Token} -class RawErrorListener() extends BaseErrorListener { +import scala.collection.mutable - private var errors = List[Message]() +class Rql2ErrorListener extends BaseErrorListener { + + private val errors = new mutable.ListBuffer[Message] private def improveErrorMessage(msg: String): String = { val extraneousPattern = "extraneous input '(.+)' expecting \\{(.*?)}".r @@ -75,9 +77,10 @@ class RawErrorListener() extends BaseErrorListener { ErrorPosition(line, getCharPositionInLinePlusOne + 1) ) } - errors = errors :+ ErrorMessage(improveErrorMessage(msg), List(positions), ParserErrors.ParserErrorCode) + errors.append(ErrorMessage(improveErrorMessage(msg), List(positions), ParserErrors.ParserErrorCode)) } - def getErrors: List[Message] = errors + def getErrors: List[Message] = errors.to + def hasErrors: Boolean = errors.nonEmpty } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2Positions.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawPositions.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2Positions.scala index e5fce72bc..d58dff223 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2Positions.scala @@ -15,11 +15,10 @@ package com.rawlabs.snapi.frontend.rql2.antlr4 import org.antlr.v4.runtime.{ParserRuleContext, Token} import org.bitbucket.inkytonik.kiama.util.{Position, Positions, Source} -class RawPositions(positions: Positions, source: Source) { +class Rql2Positions(positions: Positions, source: Source) { /** - * * Sets the position of the node in the position map based on start and end of a - * ParserRuleContext object + * Sets the position of the node in the position map based on start and end of a ParserRuleContext object. * * @param ctx the context to get the position from * @param node the node to store in the positions map @@ -39,7 +38,7 @@ class RawPositions(positions: Positions, source: Source) { } /** - * * Sets the position of the node in the position map based on start and end of a Token object + * Sets the position of the node in the position map based on start and end of a Token object * * @param token the token to get the position from * @param node the node to store in the positions map @@ -55,7 +54,7 @@ class RawPositions(positions: Positions, source: Source) { } /** - * * Sets the position of the node in the position map based on start token and end token object + * Sets the position of the node in the position map based on start token and end token object * * @param startToken start of the position * @param endToken end of the position diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawSnapiVisitor.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2SnapiVisitor.scala similarity index 99% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawSnapiVisitor.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2SnapiVisitor.scala index 040241a2c..de99cf93f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawSnapiVisitor.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2SnapiVisitor.scala @@ -18,22 +18,22 @@ import org.antlr.v4.runtime.ParserRuleContext import org.apache.commons.codec.binary.Hex import org.bitbucket.inkytonik.kiama.util.{Positions, Source} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import com.rawlabs.snapi.parser.generated.{SnapiParser, SnapiParserBaseVisitor} import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.JavaConverters._ import scala.util.Try -class RawSnapiVisitor( +class Rql2SnapiVisitor( positions: Positions, private val source: Source, isFrontend: Boolean, - private val errors: RawVisitorParseErrors + private val errors: Rql2VisitorParseErrors ) extends SnapiParserBaseVisitor[SourceNode] { - private val positionsWrapper = new RawPositions(positions, source) + private val positionsWrapper = new Rql2Positions(positions, source) private val assertionMessage = "This is a helper (better grammar readability) node, should never visit it" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawVisitorParseErrors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2VisitorParseErrors.scala similarity index 67% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawVisitorParseErrors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2VisitorParseErrors.scala index 7be9bdaa7..9ea3830d2 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/RawVisitorParseErrors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2VisitorParseErrors.scala @@ -14,8 +14,13 @@ package com.rawlabs.snapi.frontend.rql2.antlr4 import com.rawlabs.compiler.Message -case class RawVisitorParseErrors() { - private var errors: List[Message] = List.empty - def addError(error: Message): Unit = errors = errors :+ error - def getErrors: List[Message] = errors +import scala.collection.mutable + +class Rql2VisitorParseErrors { + + private val errors = new mutable.ListBuffer[Message] + + def addError(error: Message): Unit = errors.append(error) + + def getErrors: List[Message] = errors.to } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala deleted file mode 100644 index e8f49a614..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/EntryExtensionProvider.scala +++ /dev/null @@ -1,302 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.api - -object EntryExtensionProvider { - - private val entryExtensions: Array[EntryExtension] = Array( - new com.rawlabs.snapi.frontend.rql2.builtin.AwsV4SignedRequest, - new com.rawlabs.snapi.frontend.rql2.builtin.FromStringBinaryEntryExtension, - new com.rawlabs.snapi.frontend.rql2.builtin.BinaryReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.BinaryBase64Entry, - new com.rawlabs.snapi.frontend.rql2.builtin.ByteFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EmptyCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.BuildCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FilterCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.AvgCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OrderByCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TransformCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DistinctCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.CountCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TupleAvgCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MinCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MaxCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SumCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FirstCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FindFirstCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LastCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FindLastCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TakeCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ExplodeCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.UnnestCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FromCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.GroupCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.JoinCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.InternalJoinCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EquiJoinCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.InternalEquiJoinCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.UnionCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ExistsCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ContainsCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ZipCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MkStringCollectionEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.CsvInferAndReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.CsvReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.CsvInferAndParseEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.CsvParseEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateFromEpochDayEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateFromTimestampEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateParseEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateNowEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateYearEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateMonthEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateDayEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateAddIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DecimalFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DecimalRoundEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DoubleFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentSecretEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentScopesEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentParameterEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildWithTypeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ErrorGetEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FloatFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FunctionInvokeAfterEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlEncodeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlDecodeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpPutEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpDeleteEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpGetEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpHeadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpOptionsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpPatchEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpPostEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.BuildIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalToMillisEntryExtension, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalFromMillisEntryExtension, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalParseEntryExtension, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalYearsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalMonthsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalWeeksEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalDaysEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalHoursEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalMinutesEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalSecondsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalMillisEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntRangeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.InferAndReadJsonEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ReadJsonEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.InferAndParseJsonEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ParseJsonEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.PrintJsonEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.KryoEncodeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.KryoDecodeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EmptyListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.BuildListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.GetListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FilterListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TransformListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TakeListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SumListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MaxListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MinListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FirstListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FindFirstListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LastListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FindLastListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.CountListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ExplodeListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.UnnestListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FromListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.UnsafeFromListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.GroupListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.JoinListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.EquiJoinListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OrderByListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DistinctListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.UnionListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.AvgListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ExistsListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ContainsListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ZipListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MkStringListEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LocationFromStringEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LocationDescribeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LocationLsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LocationLlEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LongFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LongRangeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathPiEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathRandomEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathPowerEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathAtn2Entry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathAbsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathAcosEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathAsinEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathAtanEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathCeilingEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathCosEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathCotEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathDegreesEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathExpEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathLogEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathLog10Entry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathRadiansEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathSignEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathSinEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathSqrtEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathTanEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathSquareEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MathFloorEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MySQLInferAndReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MySQLReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MySQLInferAndQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MySQLQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.NullableEmptyEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.NullableBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.NullableIsNullEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.NullableUnsafeGetEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.NullableTransformEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FlatMapNullableTryableEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OracleInferAndReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OracleReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OracleInferAndQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OracleQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLInferAndReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLInferAndQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordConcatEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordFieldsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordAddFieldEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordRemoveFieldEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordGetFieldByIndexEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RegexReplaceEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RegexMatchesEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RegexFirstMatchInEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RegexGroupsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.S3BuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ShortFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeInferAndReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeInferAndQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerInferAndReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerInferAndQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerQueryEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringFromEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringReadEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringContainsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringTrimEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringLTrimEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringRTrimEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringReplaceEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringReverseEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringReplicateEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringUpperEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringLowerEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringSplitEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringLengthEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringSubStringEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringCountSubStringEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringStartsWithEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringEmptyEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.Base64EntryExtension, - new com.rawlabs.snapi.frontend.rql2.builtin.StringEncodeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringDecodeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringLevenshteinDistanceEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringReadLinesEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringCapitalizeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.SuccessBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MandatoryExpArgsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.MandatoryValueArgsEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OptionalExpArgsTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OptionalValueArgsTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.OptionalValueArgSugar, - new com.rawlabs.snapi.frontend.rql2.builtin.VarValueArgSugarTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.VarExpArgsTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.VarValueArgsTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringValueTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringExpTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsColPassThroughTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsColConsumeTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ByteValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ShortValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.LongValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.FloatValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DoubleValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.StringValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.BoolValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.DateValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ListValueArgTestEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeParseEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeNowEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeHourEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeMinuteEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeSecondEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeMillisEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeAddIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampBuildEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromDateEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampParseEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampNowEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampRangeEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampYearEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampMonthEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampDayEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampHourEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampMinuteEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampSecondEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampMillisEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromUnixTimestampEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampToUnixTimestampEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampTimeBucketEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampAddIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractIntervalEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TryTransformEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TryIsErrorEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TryIsSuccessEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TryFlatMapEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TryUnsafeGetEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TypeCastEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TypeProtectCastEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TypeEmptyEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.TypeMatchEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.InferAndReadXmlEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ReadXmlEntry, - new com.rawlabs.snapi.frontend.rql2.builtin.ParseXmlEntry - ) - - def getEntries(name: String): Array[EntryExtension] = { - entryExtensions.filter(_.packageName == name) - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala deleted file mode 100644 index 7c87a9735..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtensionProvider.scala +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.api - -import com.rawlabs.snapi.frontend.rql2.PackageEntity - -object PackageExtensionProvider { - - private val packageExtensions: Array[PackageExtension] = Array( - new com.rawlabs.snapi.frontend.rql2.builtin.BytePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.ShortPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.IntPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.LongPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.TimestampPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.DatePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.TimePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.RegexPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.StringPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.MathPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.CsvPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.CollectionPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.RecordPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.TypePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.LocationPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.ListPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.FloatPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.DoublePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.DecimalPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.BinaryPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.IntervalPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.JsonPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.XmlPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.ErrorPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.SuccessPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.NullablePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.TryPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.NullableTryablePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.HttpPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.S3Package, - new com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.OraclePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.SQLServerPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.MySQLPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.SnowflakePackage, - new com.rawlabs.snapi.frontend.rql2.builtin.FunctionPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.AwsPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.TestPackage, - new com.rawlabs.snapi.frontend.rql2.builtin.KryoPackage - ) - - val names: Array[String] = packageExtensions.map(_.name) - - val packages: Array[PackageEntity] = packageExtensions.map(s => new PackageEntity(s)) - - def getPackage(name: String): Option[PackageExtension] = { - packageExtensions.collectFirst { case p if p.name == name => p } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala deleted file mode 100644 index 3543748cc..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackageBuilder.scala +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object BinaryPackageBuilder { - - object FromString { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Binary"), "FromString"), Vector(FunAppArg(e, None))) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala deleted file mode 100644 index b38cb15b8..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object BytePackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Byte"), "Build"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala deleted file mode 100644 index 9e062637d..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackageBuilder.scala +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object CollectionPackageBuilder { - object Transform { - def apply(x: Exp, f: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Transform"), Vector(FunAppArg(x, None), FunAppArg(f, None))) - } - } - - object Filter { - def apply(x: Exp, f: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Filter"), Vector(FunAppArg(x, None), FunAppArg(f, None))) - } - } - - object From { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "From"), Vector(FunAppArg(x, None))) - } - } - - object TupleAvg { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "TupleAvg"), Vector(FunAppArg(x, None))) - } - } - - object First { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "First"), Vector(FunAppArg(x, None))) - } - } - - object Last { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Last"), Vector(FunAppArg(x, None))) - } - } - - object Union { - def apply(collections: Vector[Exp]): Exp = { - val args = collections.map(x => FunAppArg(x, None)) - FunApp(Proj(PackageIdnExp("Collection"), "Union"), args) - } - } - - object Exists { - def apply(list: Exp, predicate: Exp) = { - FunApp(Proj(PackageIdnExp("Collection"), "Exists"), Vector(FunAppArg(list, None), FunAppArg(predicate, None))) - } - } - - object Distinct { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Distinct"), Vector(FunAppArg(x, None))) - } - } - - object Empty { - def apply(t: Type): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) - } - } - - object EquiJoin { - def apply(left: Exp, right: Exp, leftK: Exp, rightK: Exp): Exp = { - val args = Vector(left, right, leftK, rightK).map(v => FunAppArg(v, None)) - FunApp(Proj(PackageIdnExp("Collection"), "EquiJoin"), args) - } - } - - object Join { - def apply(left: Exp, right: Exp, filter: Exp): Exp = { - val args = Vector(left, right, filter).map(v => FunAppArg(v, None)) - FunApp(Proj(PackageIdnExp("Collection"), "Join"), args) - } - } - - object InternalEquiJoin { - def apply(left: Exp, right: Exp, leftK: Exp, rightK: Exp, remapF: Exp): Exp = { - val args = Vector(left, right, leftK, rightK, remapF).map(v => FunAppArg(v, None)) - FunApp(Proj(PackageIdnExp("Collection"), "InternalEquiJoin"), args) - } - } - - object InternalJoin { - def apply(left: Exp, right: Exp, remap: Exp, filter: Exp): Exp = { - val args = Vector(left, right, remap, filter).map(v => FunAppArg(v, None)) - FunApp(Proj(PackageIdnExp("Collection"), "InternalJoin"), args) - } - } - - object Explode { - def apply(left: Exp, right: Exp): Exp = { - val args = Vector(left, right).map(v => FunAppArg(v, None)) - FunApp(Proj(PackageIdnExp("Collection"), "Explode"), args) - } - } - - object Unnest { - def apply(in: Exp, f: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Unnest"), Vector(FunAppArg(in, None), FunAppArg(f, None))) - } - } - - object OrderBy { - def apply(c: Exp, keysAndOrders: Vector[Exp]): Exp = { - val args = (c +: keysAndOrders).map(e => FunAppArg(e, None)) - FunApp(Proj(PackageIdnExp("Collection"), "OrderBy"), args) - } - } - - object Zip { - def apply(list1: Exp, list2: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Collection"), "Zip"), Vector(FunAppArg(list1, None), FunAppArg(list2, None))) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala deleted file mode 100644 index 52f68b4e9..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackageBuilder.scala +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -import java.time.LocalDate - -object DatePackageBuilder { - - object FromTimestamp { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Date"), "FromTimestamp"), Vector(FunAppArg(e, None))) - } - } - - object FromLocalDate { - def apply(d: LocalDate): Exp = { - FunApp( - Proj(PackageIdnExp("Date"), "Build"), - Vector( - FunAppArg(IntConst(d.getYear.toString), None), - FunAppArg(IntConst(d.getMonthValue.toString), None), - FunAppArg(IntConst(d.getDayOfMonth.toString), None) - ) - ) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala deleted file mode 100644 index 92316a0b3..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object DecimalPackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Decimal"), "From"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala deleted file mode 100644 index 8f0f56ee1..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object DoublePackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Double"), "From"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala deleted file mode 100644 index 0fd88373a..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackageBuilder.scala +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object EnvironmentPackageBuilder { - - object Parameter { - def apply(tipe: Type, name: Exp): Exp = { - FunApp( - Proj(PackageIdnExp("Environment"), "Parameter"), - Vector(FunAppArg(TypeExp(tipe), None), FunAppArg(name, None)) - ) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala deleted file mode 100644 index 029f80e79..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackageBuilder.scala +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object ErrorPackageBuilder { - - object BuildWithType { - def apply(t: Type, e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Error"), "BuildWithType"), Vector(FunAppArg(TypeExp(t), None), FunAppArg(e, None))) - } - } - - object Get { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Error"), "Get"), Vector(FunAppArg(e, None))) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala deleted file mode 100644 index 38bd4de4b..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackageBuilder.scala +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object FloatPackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Float"), "From"), Vector(FunAppArg(e, None))) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala deleted file mode 100644 index c1e671226..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object IntPackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Int"), "From"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala deleted file mode 100644 index 00d12335d..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackageBuilder.scala +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object IntervalPackageBuilder { - - object Build { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Interval"), "Build"), Vector(FunAppArg(e, None))) - } - } - - object FromRawInterval { - def apply(years: Int, months: Int, weeks: Int, days: Int, hours: Int, minutes: Int, seconds: Int, millis: Int) - : Exp = { - FunApp( - Proj(PackageIdnExp("Interval"), "Build"), - Vector( - FunAppArg(IntConst(years.toString), Some("years")), - FunAppArg(IntConst(months.toString), Some("months")), - FunAppArg(IntConst(days.toString), Some("days")), - FunAppArg(IntConst(hours.toString), Some("hours")), - FunAppArg(IntConst(minutes.toString), Some("minutes")), - FunAppArg(IntConst(seconds.toString), Some("seconds")), - FunAppArg(IntConst(millis.toString), Some("millis")) - ) - ) - - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala deleted file mode 100644 index 24f4969bd..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackageBuilder.scala +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object ListPackageBuilder { - - object Build { - def apply(es: Exp*): Exp = { - FunApp(Proj(PackageIdnExp("List"), "Build"), es.map(e => FunAppArg(e, None)).to) - } - def unapply(e: Exp): Option[Seq[Exp]] = e match { - case FunApp(Proj(PackageIdnExp("List"), "Build"), es) => Some(es.map(_.e)) - case _ => None - } - } - - object Transform { - def apply(x: Exp, f: Exp): Exp = { - FunApp(Proj(PackageIdnExp("List"), "Transform"), Vector(FunAppArg(x, None), FunAppArg(f, None))) - } - } - - object Filter { - def apply(x: Exp, f: Exp): Exp = { - FunApp(Proj(PackageIdnExp("List"), "Filter"), Vector(FunAppArg(x, None), FunAppArg(f, None))) - } - } - - object UnsafeFrom { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("List"), "UnsafeFrom"), Vector(FunAppArg(x, None))) - } - } - - object First { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("List"), "First"), Vector(FunAppArg(x, None))) - } - } - - object Last { - def apply(x: Exp): Exp = { - FunApp(Proj(PackageIdnExp("List"), "Last"), Vector(FunAppArg(x, None))) - } - } - - object Empty { - def apply(t: Type): Exp = { - FunApp(Proj(PackageIdnExp("List"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) - } - } - - object Exists { - def apply(list: Exp, predicate: Exp) = { - FunApp(Proj(PackageIdnExp("List"), "Exists"), Vector(FunAppArg(list, None), FunAppArg(predicate, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala deleted file mode 100644 index 0cb382b0d..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackageBuilder.scala +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object LocationPackageBuilder { - - object FromString { - def apply(url: Exp): Exp = { - FunApp( - Proj(PackageIdnExp("Location"), "FromString"), - Vector(FunAppArg(url, None)) - ) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala deleted file mode 100644 index e66499bf0..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object LongPackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Long"), "From"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala deleted file mode 100644 index 1ec4517c5..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackageBuilder.scala +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object NullablePackageBuilder { - - object Empty { - def apply(t: Type): Exp = { - FunApp(Proj(PackageIdnExp("Nullable"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) - } - } - - object UnsafeGet { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Nullable"), "UnsafeGet"), Vector(FunAppArg(e, None))) - } - } - - object Build { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Nullable"), "Build"), Vector(FunAppArg(e, None))) - } - } - - object Transform { - def apply(f: Exp, e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Nullable"), "Transform"), Vector(FunAppArg(f, None), FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala deleted file mode 100644 index fd7e841f2..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object NullableTryablePackageBuilder { - - object FlatMap { - def apply(e: Exp, f: Exp): Exp = { - FunApp(Proj(PackageIdnExp("NullableTryable"), "FlatMap"), Vector(FunAppArg(e, None), FunAppArg(f, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala deleted file mode 100644 index e4e950b93..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackageBuilder.scala +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object RecordPackageBuilder { - object Build { - def apply(atts: Vector[(String, Exp)]): Exp = { - FunApp(Proj(PackageIdnExp("Record"), "Build"), atts.map { case (idn, e) => FunAppArg(e, Some(idn)) }.to) - } - def apply(atts: Exp*): Exp = { - FunApp( - Proj(PackageIdnExp("Record"), "Build"), - atts.zipWithIndex.map { case (e, idx) => FunAppArg(e, Some(s"_${idx + 1}")) }.to - ) - } - def unapply(e: Exp): Option[Vector[(String, Exp)]] = e match { - case FunApp(Proj(PackageIdnExp("Record"), "Build"), atts) => - Some(atts.map { case FunAppArg(e, Some(idn)) => (idn, e) }) - case _ => None - } - } - - object AddField { - def apply(r: Exp, e: Exp, name: String) = - FunApp(Proj(PackageIdnExp("Record"), "AddField"), Vector(FunAppArg(r, None), FunAppArg(e, Some(name)))) - } - - object Concat { - def apply(r1: Exp, r2: Exp) = - FunApp(Proj(PackageIdnExp("Record"), "Concat"), Vector(FunAppArg(r1, None), FunAppArg(r2, None))) - } - - object GetFieldByIndex { - def apply(r: Exp, idx: Exp) = - FunApp(Proj(PackageIdnExp("Record"), "GetFieldByIndex"), Vector(FunAppArg(r, None), FunAppArg(idx, None))) - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala deleted file mode 100644 index 8182db6cd..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object ShortPackageBuilder { - - object From { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Short"), "From"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala deleted file mode 100644 index b6cf33cbf..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackageBuilder.scala +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object SuccessPackageBuilder { - - object Build { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Success"), "Build"), Vector(FunAppArg(e, None))) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala deleted file mode 100644 index dac4e0318..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackageBuilder.scala +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -import java.time.{LocalDate, LocalTime} - -object TimePackageBuilder { - - object FromLocalTime { - def apply(t: LocalTime): Exp = { - FunApp( - Proj(PackageIdnExp("Time"), "Build"), - Vector( - FunAppArg(IntConst(t.getHour.toString), None), - FunAppArg(IntConst(t.getMinute.toString), None), - FunAppArg(IntConst(t.getSecond.toString), Some("seconds")), - FunAppArg(IntConst((t.getNano / 1000000).toString), Some("millis")) - ) - ) - } - } - - object FromLocalDate { - def apply(d: LocalDate): Exp = { - FunApp( - Proj(PackageIdnExp("Date"), "Build"), - Vector( - FunAppArg(IntConst(d.getYear.toString), None), - FunAppArg(IntConst(d.getMonthValue.toString), None), - FunAppArg(IntConst(d.getDayOfMonth.toString), None) - ) - ) - } - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala deleted file mode 100644 index 1155215cb..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackageBuilder.scala +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -import java.time.LocalDateTime - -object TimestampPackageBuilder { - - object FromDate { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Timestamp"), "FromDate"), Vector(FunAppArg(e, None))) - } - } - - object FromLocalDateTime { - def apply(d: LocalDateTime): Exp = { - FunApp( - Proj(PackageIdnExp("Timestamp"), "Build"), - Vector( - FunAppArg(IntConst(d.getYear.toString), None), - FunAppArg(IntConst(d.getMonthValue.toString), None), - FunAppArg(IntConst(d.getDayOfMonth.toString), None), - FunAppArg(IntConst(d.getHour.toString), None), - FunAppArg(IntConst(d.getMinute.toString), None), - FunAppArg(IntConst(d.getSecond.toString), Some("seconds")), - FunAppArg(IntConst((d.getNano / 1000000).toString), Some("millis")) - ) - ) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala deleted file mode 100644 index 14ef0d695..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackageBuilder.scala +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object TryPackageBuilder { - - object Transform { - def apply(f: Exp, e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Try"), "Transform"), Vector(FunAppArg(f, None), FunAppArg(e, None))) - } - } - object FlatMap { - def apply(f: Exp, e: Exp): Exp = { - FunApp(Proj(IdnExp("Try"), "FlatMap"), Vector(FunAppArg(f, None), FunAppArg(e, None))) - } - } - - object UnsafeGet { - def apply(e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Try"), "UnsafeGet"), Vector(FunAppArg(e, None))) - } - } - -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala deleted file mode 100644 index b4aae24d5..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackageBuilder.scala +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.builtin - -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.source._ - -object TypePackageBuilder { - - def Cast(t: Type, e: Exp): Exp = { - FunApp(Proj(PackageIdnExp("Type"), "Cast"), Vector(FunAppArg(TypeExp(t), None), FunAppArg(e, None))) - } - - def ProtectCast(actual: Type, target: Type, e: Exp): Exp = { - FunApp( - Proj(PackageIdnExp("Type"), "ProtectCast"), - Vector(FunAppArg(TypeExp(actual), None), FunAppArg(TypeExp(target), None), FunAppArg(e, None)) - ) - } - def Empty(t: Type): Exp = { - FunApp(Proj(PackageIdnExp("Type"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala new file mode 100644 index 000000000..1a618f931 --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala @@ -0,0 +1,304 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.rql2.extensions + +import com.rawlabs.snapi.frontend.rql2.extensions.builtin._ + +object EntryExtensionProvider { + + private val entryExtensions: Array[EntryExtension] = Array( + new AwsV4SignedRequest, + new FromStringBinaryEntryExtension, + new BinaryReadEntry, + new BinaryBase64Entry, + new ByteFromEntry, + new EmptyCollectionEntry, + new BuildCollectionEntry, + new FilterCollectionEntry, + new AvgCollectionEntry, + new OrderByCollectionEntry, + new TransformCollectionEntry, + new DistinctCollectionEntry, + new CountCollectionEntry, + new TupleAvgCollectionEntry, + new MinCollectionEntry, + new MaxCollectionEntry, + new SumCollectionEntry, + new FirstCollectionEntry, + new FindFirstCollectionEntry, + new LastCollectionEntry, + new FindLastCollectionEntry, + new TakeCollectionEntry, + new ExplodeCollectionEntry, + new UnnestCollectionEntry, + new FromCollectionEntry, + new GroupCollectionEntry, + new JoinCollectionEntry, + new InternalJoinCollectionEntry, + new EquiJoinCollectionEntry, + new InternalEquiJoinCollectionEntry, + new UnionCollectionEntry, + new ExistsCollectionEntry, + new ContainsCollectionEntry, + new ZipCollectionEntry, + new MkStringCollectionEntry, + new CsvInferAndReadEntry, + new CsvReadEntry, + new CsvInferAndParseEntry, + new CsvParseEntry, + new DateBuildEntry, + new DateFromEpochDayEntry, + new DateFromTimestampEntry, + new DateParseEntry, + new DateNowEntry, + new DateYearEntry, + new DateMonthEntry, + new DateDayEntry, + new DateSubtractEntry, + new DateAddIntervalEntry, + new DateSubtractIntervalEntry, + new DecimalFromEntry, + new DecimalRoundEntry, + new DoubleFromEntry, + new EnvironmentSecretEntry, + new EnvironmentScopesEntry, + new EnvironmentParameterEntry, + new ErrorBuildEntry, + new ErrorBuildWithTypeEntry, + new ErrorGetEntry, + new FloatFromEntry, + new FunctionInvokeAfterEntry, + new HttpReadEntry, + new HttpUrlEncodeEntry, + new HttpUrlDecodeEntry, + new HttpPutEntry, + new HttpDeleteEntry, + new HttpGetEntry, + new HttpHeadEntry, + new HttpOptionsEntry, + new HttpPatchEntry, + new HttpPostEntry, + new BuildIntervalEntry, + new IntervalToMillisEntryExtension, + new IntervalFromMillisEntryExtension, + new IntervalParseEntryExtension, + new IntervalYearsEntry, + new IntervalMonthsEntry, + new IntervalWeeksEntry, + new IntervalDaysEntry, + new IntervalHoursEntry, + new IntervalMinutesEntry, + new IntervalSecondsEntry, + new IntervalMillisEntry, + new IntFromEntry, + new IntRangeEntry, + new InferAndReadJsonEntry, + new ReadJsonEntry, + new InferAndParseJsonEntry, + new ParseJsonEntry, + new PrintJsonEntry, + new KryoEncodeEntry, + new KryoDecodeEntry, + new EmptyListEntry, + new BuildListEntry, + new GetListEntry, + new FilterListEntry, + new TransformListEntry, + new TakeListEntry, + new SumListEntry, + new MaxListEntry, + new MinListEntry, + new FirstListEntry, + new FindFirstListEntry, + new LastListEntry, + new FindLastListEntry, + new CountListEntry, + new ExplodeListEntry, + new UnnestListEntry, + new FromListEntry, + new UnsafeFromListEntry, + new GroupListEntry, + new JoinListEntry, + new EquiJoinListEntry, + new OrderByListEntry, + new DistinctListEntry, + new UnionListEntry, + new AvgListEntry, + new ExistsListEntry, + new ContainsListEntry, + new ZipListEntry, + new MkStringListEntry, + new LocationFromStringEntry, + new LocationDescribeEntry, + new LocationLsEntry, + new LocationLlEntry, + new LongFromEntry, + new LongRangeEntry, + new MathPiEntry, + new MathRandomEntry, + new MathPowerEntry, + new MathAtn2Entry, + new MathAbsEntry, + new MathAcosEntry, + new MathAsinEntry, + new MathAtanEntry, + new MathCeilingEntry, + new MathCosEntry, + new MathCotEntry, + new MathDegreesEntry, + new MathExpEntry, + new MathLogEntry, + new MathLog10Entry, + new MathRadiansEntry, + new MathSignEntry, + new MathSinEntry, + new MathSqrtEntry, + new MathTanEntry, + new MathSquareEntry, + new MathFloorEntry, + new MySQLInferAndReadEntry, + new MySQLReadEntry, + new MySQLInferAndQueryEntry, + new MySQLQueryEntry, + new NullableEmptyEntry, + new NullableBuildEntry, + new NullableIsNullEntry, + new NullableUnsafeGetEntry, + new NullableTransformEntry, + new FlatMapNullableTryableEntry, + new OracleInferAndReadEntry, + new OracleReadEntry, + new OracleInferAndQueryEntry, + new OracleQueryEntry, + new PostgreSQLInferAndReadEntry, + new PostgreSQLReadEntry, + new PostgreSQLInferAndQueryEntry, + new PostgreSQLQueryEntry, + new RecordBuildEntry, + new RecordConcatEntry, + new RecordFieldsEntry, + new RecordAddFieldEntry, + new RecordRemoveFieldEntry, + new RecordGetFieldByIndexEntry, + new RegexReplaceEntry, + new RegexMatchesEntry, + new RegexFirstMatchInEntry, + new RegexGroupsEntry, + new S3BuildEntry, + new ShortFromEntry, + new SnowflakeInferAndReadEntry, + new SnowflakeReadEntry, + new SnowflakeInferAndQueryEntry, + new SnowflakeQueryEntry, + new SQLServerInferAndReadEntry, + new SQLServerReadEntry, + new SQLServerInferAndQueryEntry, + new SQLServerQueryEntry, + new StringFromEntry, + new StringReadEntry, + new StringContainsEntry, + new StringTrimEntry, + new StringLTrimEntry, + new StringRTrimEntry, + new StringReplaceEntry, + new StringReverseEntry, + new StringReplicateEntry, + new StringUpperEntry, + new StringLowerEntry, + new StringSplitEntry, + new StringLengthEntry, + new StringSubStringEntry, + new StringCountSubStringEntry, + new StringStartsWithEntry, + new StringEmptyEntry, + new Base64EntryExtension, + new StringEncodeEntry, + new StringDecodeEntry, + new StringLevenshteinDistanceEntry, + new StringReadLinesEntry, + new StringCapitalizeEntry, + new SuccessBuildEntry, + new MandatoryExpArgsEntry, + new MandatoryValueArgsEntry, + new OptionalExpArgsTestEntry, + new OptionalValueArgsTestEntry, + new OptionalValueArgSugar, + new VarValueArgSugarTestEntry, + new VarExpArgsTestEntry, + new VarValueArgsTestEntry, + new VarNullableStringValueTestEntry, + new VarNullableStringExpTestEntry, + new StrictArgsTestEntry, + new StrictArgsColPassThroughTestEntry, + new StrictArgsColConsumeTestEntry, + new ByteValueArgTestEntry, + new ShortValueArgTestEntry, + new IntValueArgTestEntry, + new LongValueArgTestEntry, + new FloatValueArgTestEntry, + new DoubleValueArgTestEntry, + new StringValueArgTestEntry, + new BoolValueArgTestEntry, + new DateValueArgTestEntry, + new TimeValueArgTestEntry, + new TimestampValueArgTestEntry, + new IntervalValueArgTestEntry, + new RecordValueArgTestEntry, + new ListValueArgTestEntry, + new TimeBuildEntry, + new TimeParseEntry, + new TimeNowEntry, + new TimeHourEntry, + new TimeMinuteEntry, + new TimeSecondEntry, + new TimeMillisEntry, + new TimeSubtractEntry, + new TimeAddIntervalEntry, + new TimeSubtractIntervalEntry, + new TimestampBuildEntry, + new TimestampFromDateEntry, + new TimestampParseEntry, + new TimestampNowEntry, + new TimestampRangeEntry, + new TimestampYearEntry, + new TimestampMonthEntry, + new TimestampDayEntry, + new TimestampHourEntry, + new TimestampMinuteEntry, + new TimestampSecondEntry, + new TimestampMillisEntry, + new TimestampFromUnixTimestampEntry, + new TimestampToUnixTimestampEntry, + new TimestampTimeBucketEntry, + new TimestampSubtractEntry, + new TimestampAddIntervalEntry, + new TimestampSubtractIntervalEntry, + new TryTransformEntry, + new TryIsErrorEntry, + new TryIsSuccessEntry, + new TryFlatMapEntry, + new TryUnsafeGetEntry, + new TypeCastEntry, + new TypeProtectCastEntry, + new TypeEmptyEntry, + new TypeMatchEntry, + new InferAndReadXmlEntry, + new ReadXmlEntry, + new ParseXmlEntry + ) + + def getEntries(name: String): Array[EntryExtension] = { + entryExtensions.filter(_.packageName == name) + } + +} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/LocationDescription.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/LocationDescription.scala similarity index 99% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/LocationDescription.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/LocationDescription.scala index a520ed266..aed3c9777 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/LocationDescription.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/LocationDescription.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.api +package com.rawlabs.snapi.frontend.rql2.extensions import com.rawlabs.utils.sources.api.Location import com.rawlabs.utils.sources.bytestream.github.GitHubLocation diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtension.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtension.scala similarity index 99% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtension.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtension.scala index 97306ef0f..5d6c91914 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/api/PackageExtension.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtension.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.api +package com.rawlabs.snapi.frontend.rql2.extensions import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2TypeUtils} +import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2TypeUtils, Rql2Value} import com.rawlabs.utils.sources.api._ import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala new file mode 100644 index 000000000..5855eeef0 --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala @@ -0,0 +1,71 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.rql2.extensions + +import com.rawlabs.snapi.frontend.rql2.PackageEntity +import com.rawlabs.snapi.frontend.rql2.extensions.builtin._ + +object PackageExtensionProvider { + + private val packageExtensions: Array[PackageExtension] = Array( + new BytePackage, + new ShortPackage, + new IntPackage, + new LongPackage, + new TimestampPackage, + new DatePackage, + new TimePackage, + new RegexPackage, + new StringPackage, + new MathPackage, + new CsvPackage, + new CollectionPackage, + new RecordPackage, + new TypePackage, + new LocationPackage, + new ListPackage, + new FloatPackage, + new DoublePackage, + new DecimalPackage, + new BinaryPackage, + new IntervalPackage, + new JsonPackage, + new XmlPackage, + new ErrorPackage, + new SuccessPackage, + new NullablePackage, + new TryPackage, + new NullableTryablePackage, + new EnvironmentPackage, + new HttpPackage, + new S3Package, + new PostgreSQLPackage, + new OraclePackage, + new SQLServerPackage, + new MySQLPackage, + new SnowflakePackage, + new FunctionPackage, + new AwsPackage, + new TestPackage, + new KryoPackage + ) + + val names: Array[String] = packageExtensions.map(_.name) + + val packages: Array[PackageEntity] = packageExtensions.map(s => new PackageEntity(s)) + + def getPackage(name: String): Option[PackageExtension] = { + packageExtensions.collectFirst { case p if p.name == name => p } + } + +} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/Aggregations.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/Aggregations.scala similarity index 93% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/Aggregations.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/Aggregations.scala index ebf20caef..b818163d5 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/Aggregations.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/Aggregations.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.frontend.rql2.api.{EntryExtension, EntryExtensionHelper} +import com.rawlabs.snapi.frontend.rql2.extensions.{EntryExtension, EntryExtensionHelper} import com.rawlabs.snapi.frontend.rql2.source.{ HasTypeProperties, IsNullable, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/AwsPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/AwsPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/AwsPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/AwsPackage.scala index d97d78320..e3b613ca1 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/AwsPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/AwsPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ class AwsPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BinaryPackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BinaryPackage.scala index 028258e1a..a41a75fa4 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BinaryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BinaryPackage.scala @@ -10,13 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, ShortEntryExtension} import com.rawlabs.snapi.frontend.rql2.source._ +object BinaryPackageBuilder { + + object FromString { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Binary"), "FromString"), Vector(FunAppArg(e, None))) + } + } + +} + class BinaryPackage extends PackageExtension { override def name: String = "Binary" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BytePackage.scala similarity index 86% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BytePackage.scala index 42eb600b3..2513cf4fd 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/BytePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BytePackage.scala @@ -10,14 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object BytePackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Byte"), "Build"), Vector(FunAppArg(e, None))) + } + } +} + class BytePackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CollectionPackage.scala similarity index 94% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CollectionPackage.scala index b1e8a8722..9438eedf0 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CollectionPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CollectionPackage.scala @@ -10,22 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, - Rql2StringValue, SugarEntryExtension, TypeArg, TypeParam, @@ -39,6 +38,124 @@ import com.rawlabs.snapi.frontend.rql2.errors.{ OrderSpecMustFollowOrderingFunction } +object CollectionPackageBuilder { + object Transform { + def apply(x: Exp, f: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Transform"), Vector(FunAppArg(x, None), FunAppArg(f, None))) + } + } + + object Filter { + def apply(x: Exp, f: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Filter"), Vector(FunAppArg(x, None), FunAppArg(f, None))) + } + } + + object From { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "From"), Vector(FunAppArg(x, None))) + } + } + + object TupleAvg { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "TupleAvg"), Vector(FunAppArg(x, None))) + } + } + + object First { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "First"), Vector(FunAppArg(x, None))) + } + } + + object Last { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Last"), Vector(FunAppArg(x, None))) + } + } + + object Union { + def apply(collections: Vector[Exp]): Exp = { + val args = collections.map(x => FunAppArg(x, None)) + FunApp(Proj(PackageIdnExp("Collection"), "Union"), args) + } + } + + object Exists { + def apply(list: Exp, predicate: Exp) = { + FunApp(Proj(PackageIdnExp("Collection"), "Exists"), Vector(FunAppArg(list, None), FunAppArg(predicate, None))) + } + } + + object Distinct { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Distinct"), Vector(FunAppArg(x, None))) + } + } + + object Empty { + def apply(t: Type): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) + } + } + + object EquiJoin { + def apply(left: Exp, right: Exp, leftK: Exp, rightK: Exp): Exp = { + val args = Vector(left, right, leftK, rightK).map(v => FunAppArg(v, None)) + FunApp(Proj(PackageIdnExp("Collection"), "EquiJoin"), args) + } + } + + object Join { + def apply(left: Exp, right: Exp, filter: Exp): Exp = { + val args = Vector(left, right, filter).map(v => FunAppArg(v, None)) + FunApp(Proj(PackageIdnExp("Collection"), "Join"), args) + } + } + + object InternalEquiJoin { + def apply(left: Exp, right: Exp, leftK: Exp, rightK: Exp, remapF: Exp): Exp = { + val args = Vector(left, right, leftK, rightK, remapF).map(v => FunAppArg(v, None)) + FunApp(Proj(PackageIdnExp("Collection"), "InternalEquiJoin"), args) + } + } + + object InternalJoin { + def apply(left: Exp, right: Exp, remap: Exp, filter: Exp): Exp = { + val args = Vector(left, right, remap, filter).map(v => FunAppArg(v, None)) + FunApp(Proj(PackageIdnExp("Collection"), "InternalJoin"), args) + } + } + + object Explode { + def apply(left: Exp, right: Exp): Exp = { + val args = Vector(left, right).map(v => FunAppArg(v, None)) + FunApp(Proj(PackageIdnExp("Collection"), "Explode"), args) + } + } + + object Unnest { + def apply(in: Exp, f: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Unnest"), Vector(FunAppArg(in, None), FunAppArg(f, None))) + } + } + + object OrderBy { + def apply(c: Exp, keysAndOrders: Vector[Exp]): Exp = { + val args = (c +: keysAndOrders).map(e => FunAppArg(e, None)) + FunApp(Proj(PackageIdnExp("Collection"), "OrderBy"), args) + } + } + + object Zip { + def apply(list1: Exp, list2: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Collection"), "Zip"), Vector(FunAppArg(list1, None), FunAppArg(list2, None))) + } + } + +} + class CollectionPackage extends PackageExtension { override def name: String = "Collection" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CsvPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CsvPackage.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CsvPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CsvPackage.scala index d2e047135..9c4d3d103 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/CsvPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CsvPackage.scala @@ -10,27 +10,25 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, EntryExtensionHelper, ExpParam, PackageExtension, Param, - Rql2LocationValue, SugarEntryExtension, TypeParam, ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.inferrer.api._ import com.rawlabs.utils.sources.bytestream.inmemory.InMemoryByteStreamLocation @@ -219,10 +217,10 @@ class CsvInferAndReadEntry extends SugarEntryExtension with CsvEntryExtensionHel for ( inferrerProperties <- getCsvInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - TextInputStreamFormatDescriptor( + TextInputStreamInferrerOutput( _, _, - CsvInputFormatDescriptor( + CsvFormatDescriptor( SourceCollectionType(SourceRecordType(atts, _), _), _, _, @@ -266,10 +264,10 @@ class CsvInferAndReadEntry extends SugarEntryExtension with CsvEntryExtensionHel inputFormatDescriptor } - val TextInputStreamFormatDescriptor( + val TextInputStreamInferrerOutput( encoding, _, - CsvInputFormatDescriptor( + CsvFormatDescriptor( _, _, sep, @@ -593,10 +591,10 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe optionalArgs ); inputFormatDescriptor <- programContext.infer(inferrerProperties); - TextInputStreamFormatDescriptor( + TextInputStreamInferrerOutput( _, _, - CsvInputFormatDescriptor( + CsvFormatDescriptor( SourceCollectionType(SourceRecordType(atts, _), _), _, _, @@ -644,10 +642,10 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe inputFormatDescriptor } - val TextInputStreamFormatDescriptor( + val TextInputStreamInferrerOutput( _, _, - CsvInputFormatDescriptor( + CsvFormatDescriptor( _, _, sep, @@ -836,9 +834,9 @@ trait CsvEntryExtensionHelper extends EntryExtensionHelper { protected def getCsvInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - ): Either[String, CsvInferrerProperties] = { + ): Either[String, CsvInferrerInput] = { getByteStreamLocation(mandatoryArgs.head).right.map { location => - CsvInferrerProperties( + CsvInferrerInput( location, optionalArgs.collectFirst { case a if a._1 == "sampleSize" => a._2 }.map(getIntValue), optionalArgs diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DatePackage.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DatePackage.scala index 2902d969d..5fb2dd1ef 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DatePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DatePackage.scala @@ -10,12 +10,36 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} -import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, ShortEntryExtension} import com.rawlabs.snapi.frontend.rql2.source._ +import java.time.LocalDate + +object DatePackageBuilder { + + object FromTimestamp { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Date"), "FromTimestamp"), Vector(FunAppArg(e, None))) + } + } + + object FromLocalDate { + def apply(d: LocalDate): Exp = { + FunApp( + Proj(PackageIdnExp("Date"), "Build"), + Vector( + FunAppArg(IntConst(d.getYear.toString), None), + FunAppArg(IntConst(d.getMonthValue.toString), None), + FunAppArg(IntConst(d.getDayOfMonth.toString), None) + ) + ) + } + } +} + class DatePackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DecimalPackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DecimalPackage.scala index a57e0aa0e..8406fc5fa 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DecimalPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DecimalPackage.scala @@ -10,14 +10,30 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension +} import com.rawlabs.snapi.frontend.rql2.source._ +object DecimalPackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Decimal"), "From"), Vector(FunAppArg(e, None))) + } + } +} + class DecimalPackage extends PackageExtension { override def name: String = "Decimal" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DoublePackage.scala similarity index 86% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DoublePackage.scala index 325181f6a..bcb780240 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/DoublePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DoublePackage.scala @@ -10,14 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object DoublePackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Double"), "From"), Vector(FunAppArg(e, None))) + } + } +} + class DoublePackage extends PackageExtension { override def name: String = "Double" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/EnvironmentPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/EnvironmentPackage.scala index a9058b0d1..5bf99d93b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/EnvironmentPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/EnvironmentPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpParam, @@ -26,6 +26,19 @@ import com.rawlabs.snapi.frontend.rql2.api.{ } import com.rawlabs.snapi.frontend.rql2.source._ +object EnvironmentPackageBuilder { + + object Parameter { + def apply(tipe: Type, name: Exp): Exp = { + FunApp( + Proj(PackageIdnExp("Environment"), "Parameter"), + Vector(FunAppArg(TypeExp(tipe), None), FunAppArg(name, None)) + ) + } + } + +} + class EnvironmentPackage extends PackageExtension { override def name: String = "Environment" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ErrorPackage.scala similarity index 84% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ErrorPackage.scala index b22a878e4..e9252ad69 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ErrorPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ErrorPackage.scala @@ -10,14 +10,38 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, TypeArg, TypeParam} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + TypeArg, + TypeParam +} import com.rawlabs.snapi.frontend.rql2.source._ +object ErrorPackageBuilder { + + object BuildWithType { + def apply(t: Type, e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Error"), "BuildWithType"), Vector(FunAppArg(TypeExp(t), None), FunAppArg(e, None))) + } + } + + object Get { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Error"), "Get"), Vector(FunAppArg(e, None))) + } + } + +} + class ErrorPackage extends PackageExtension { override def name: String = "Error" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FloatPackage.scala similarity index 86% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FloatPackage.scala index bad2a8a57..7cda0ca14 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FloatPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FloatPackage.scala @@ -10,14 +10,24 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object FloatPackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Float"), "From"), Vector(FunAppArg(e, None))) + } + } + +} + class FloatPackage extends PackageExtension { override def name: String = "Float" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FunctionPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FunctionPackage.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FunctionPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FunctionPackage.scala index 0aa3e7613..aa57c3422 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/FunctionPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FunctionPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} import com.rawlabs.snapi.frontend.rql2.source.FunType import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class FunctionPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/HttpPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/HttpPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/HttpPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/HttpPackage.scala index e5d3aa060..7cfce7f6b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/HttpPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/HttpPackage.scala @@ -10,12 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension +} import com.rawlabs.snapi.frontend.rql2.source._ import scala.collection.immutable.ListMap diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntPackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntPackage.scala index 5481b5018..11b878e06 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntPackage.scala @@ -10,14 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object IntPackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Int"), "From"), Vector(FunAppArg(e, None))) + } + } +} + class IntPackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntervalPackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntervalPackage.scala index c82ed0c29..f192f8edd 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/IntervalPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntervalPackage.scala @@ -10,14 +10,50 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension +} import com.rawlabs.snapi.frontend.rql2.source._ +object IntervalPackageBuilder { + + object Build { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Interval"), "Build"), Vector(FunAppArg(e, None))) + } + } + + object FromRawInterval { + def apply(years: Int, months: Int, weeks: Int, days: Int, hours: Int, minutes: Int, seconds: Int, millis: Int) + : Exp = { + FunApp( + Proj(PackageIdnExp("Interval"), "Build"), + Vector( + FunAppArg(IntConst(years.toString), Some("years")), + FunAppArg(IntConst(months.toString), Some("months")), + FunAppArg(IntConst(days.toString), Some("days")), + FunAppArg(IntConst(hours.toString), Some("hours")), + FunAppArg(IntConst(minutes.toString), Some("minutes")), + FunAppArg(IntConst(seconds.toString), Some("seconds")), + FunAppArg(IntConst(millis.toString), Some("millis")) + ) + ) + + } + } + +} + class IntervalPackage extends PackageExtension { override def name: String = "Interval" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/JsonPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/JsonPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/JsonPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/JsonPackage.scala index 078b87a6d..10692beed 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/JsonPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/JsonPackage.scala @@ -10,28 +10,26 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, EntryExtensionHelper, ExpParam, PackageExtension, Param, - Rql2LocationValue, SugarEntryExtension, TypeParam, ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.inferrer.api._ import com.rawlabs.utils.sources.bytestream.inmemory.InMemoryByteStreamLocation @@ -128,17 +126,17 @@ class InferAndReadJsonEntry extends SugarEntryExtension with JsonEntryExtensionH varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { val preferNulls = optionalArgs.collectFirst { case a if a._1 == "preferNulls" => a._2 }.forall(getBoolValue) - val inferenceDiagnostic: Either[Seq[ErrorCompilerMessage], InputFormatDescriptor] = + val inferenceDiagnostic: Either[Seq[ErrorCompilerMessage], InferrerOutput] = getJsonInferrerProperties(mandatoryArgs, optionalArgs) .flatMap(programContext.infer) .left .map(error => Seq(InvalidSemantic(node, error))) for ( descriptor <- inferenceDiagnostic; - TextInputStreamFormatDescriptor( + TextInputStreamInferrerOutput( _, _, - JsonInputFormatDescriptor(inferredType, sampled, _, _, _) + JsonFormatDescriptor(inferredType, sampled, _, _, _) ) = descriptor; rql2Type = inferTypeToRql2Type(inferredType, makeNullable = preferNulls && sampled, makeTryable = sampled); okType <- validateInferredJsonType(rql2Type, node) @@ -162,10 +160,10 @@ class InferAndReadJsonEntry extends SugarEntryExtension with JsonEntryExtensionH inputFormatDescriptor } - val TextInputStreamFormatDescriptor( + val TextInputStreamInferrerOutput( encoding, _, - JsonInputFormatDescriptor( + JsonFormatDescriptor( _, _, timeFormat, @@ -364,7 +362,7 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { val codeData = getStringValue(mandatoryArgs.head) val preferNulls = optionalArgs.collectFirst { case a if a._1 == "preferNulls" => a._2 }.forall(getBoolValue) - val inferenceDiagnostic: Either[Seq[ErrorCompilerMessage], InputFormatDescriptor] = getJsonInferrerProperties( + val inferenceDiagnostic: Either[Seq[ErrorCompilerMessage], InferrerOutput] = getJsonInferrerProperties( Seq(ValueArg(Rql2LocationValue(new InMemoryByteStreamLocation(codeData), ""), Rql2LocationType())), optionalArgs ) @@ -373,10 +371,10 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension .map(error => Seq(InvalidSemantic(node, error))) for ( descriptor <- inferenceDiagnostic; - TextInputStreamFormatDescriptor( + TextInputStreamInferrerOutput( _, _, - JsonInputFormatDescriptor(inferredType, sampled, _, _, _) + JsonFormatDescriptor(inferredType, sampled, _, _, _) ) = descriptor; rql2Type = inferTypeToRql2Type(inferredType, makeNullable = preferNulls && sampled, makeTryable = sampled); okType <- validateInferredJsonType(rql2Type, node) @@ -405,10 +403,10 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension inputFormatDescriptor } - val TextInputStreamFormatDescriptor( + val TextInputStreamInferrerOutput( _, _, - JsonInputFormatDescriptor( + JsonFormatDescriptor( _, _, timeFormat, @@ -576,9 +574,9 @@ trait JsonEntryExtensionHelper extends EntryExtensionHelper { protected def getJsonInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - ): Either[String, JsonInferrerProperties] = { + ): Either[String, JsonInferrerInput] = { getByteStreamLocation(mandatoryArgs.head).right.map { location => - JsonInferrerProperties( + JsonInferrerInput( location, optionalArgs.collectFirst { case a if a._1 == "sampleSize" => a._2 }.map(getIntValue), optionalArgs diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/KryoPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/KryoPackage.scala similarity index 94% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/KryoPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/KryoPackage.scala index 9ab8649a0..4839f150c 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/KryoPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/KryoPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.extensions._ import com.rawlabs.snapi.frontend.rql2.source._ class KryoPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LibraryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LibraryPackage.scala similarity index 95% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LibraryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LibraryPackage.scala index 73c25259f..d25d9786a 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LibraryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LibraryPackage.scala @@ -1,3 +1,17 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.rql2.extensions.builtin + /* * Copyright 2023 RAW Labs S.A. * @@ -19,7 +33,7 @@ //import com.rawlabs.snapi.frontend.base.source.Type //import com.rawlabs.snapi.frontend.base.{ExpDecl, ExpDeclParam} //import com.rawlabs.snapi.frontend.common.CommonCompilerProvider -//import com.rawlabs.snapi.frontend.common.source.{Exp, VoidType} +//import com.rawlabs.snapi.frontend.rql2.source.{Exp, VoidType} //import raw.runtime.JvmEntrypoint //import com.rawlabs.snapi.frontend.rql2._ //import com.rawlabs.snapi.frontend.rql2.source._ diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ListPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ListPackage.scala index 9f64d1b64..26492e5fe 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ListPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ListPackage.scala @@ -10,21 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, - Rql2StringValue, SugarEntryExtension, TypeArg, TypeParam, @@ -39,6 +38,61 @@ import com.rawlabs.snapi.frontend.rql2.errors.{ } import com.rawlabs.snapi.frontend.rql2.source._ +object ListPackageBuilder { + + object Build { + def apply(es: Exp*): Exp = { + FunApp(Proj(PackageIdnExp("List"), "Build"), es.map(e => FunAppArg(e, None)).to) + } + def unapply(e: Exp): Option[Seq[Exp]] = e match { + case FunApp(Proj(PackageIdnExp("List"), "Build"), es) => Some(es.map(_.e)) + case _ => None + } + } + + object Transform { + def apply(x: Exp, f: Exp): Exp = { + FunApp(Proj(PackageIdnExp("List"), "Transform"), Vector(FunAppArg(x, None), FunAppArg(f, None))) + } + } + + object Filter { + def apply(x: Exp, f: Exp): Exp = { + FunApp(Proj(PackageIdnExp("List"), "Filter"), Vector(FunAppArg(x, None), FunAppArg(f, None))) + } + } + + object UnsafeFrom { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("List"), "UnsafeFrom"), Vector(FunAppArg(x, None))) + } + } + + object First { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("List"), "First"), Vector(FunAppArg(x, None))) + } + } + + object Last { + def apply(x: Exp): Exp = { + FunApp(Proj(PackageIdnExp("List"), "Last"), Vector(FunAppArg(x, None))) + } + } + + object Empty { + def apply(t: Type): Exp = { + FunApp(Proj(PackageIdnExp("List"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) + } + } + + object Exists { + def apply(list: Exp, predicate: Exp) = { + FunApp(Proj(PackageIdnExp("List"), "Exists"), Vector(FunAppArg(list, None), FunAppArg(predicate, None))) + } + } +} + class ListPackage extends PackageExtension { override def name: String = "List" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LocationPackage.scala similarity index 95% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LocationPackage.scala index c160f66f9..8066e7611 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LocationPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LocationPackage.scala @@ -10,14 +10,27 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object LocationPackageBuilder { + + object FromString { + def apply(url: Exp): Exp = { + FunApp( + Proj(PackageIdnExp("Location"), "FromString"), + Vector(FunAppArg(url, None)) + ) + } + } + +} + class LocationPackage extends PackageExtension { override def name: String = "Location" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LongPackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LongPackage.scala index 1a67f078a..134572819 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/LongPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LongPackage.scala @@ -10,14 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object LongPackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Long"), "From"), Vector(FunAppArg(e, None))) + } + } +} + class LongPackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MathPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MathPackage.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MathPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MathPackage.scala index a08247107..75ecd2562 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MathPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MathPackage.scala @@ -10,13 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension +} import com.rawlabs.snapi.frontend.rql2.source._ class MathPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MySQLPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MySQLPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MySQLPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MySQLPackage.scala index f124e2be1..07b1ed4f8 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/MySQLPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MySQLPackage.scala @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api._ -import com.rawlabs.snapi.frontend.rql2.ProgramContext +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions._ +import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2StringValue} import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.inferrer.api.{ - SqlQueryInferrerProperties, - SqlQueryInputFormatDescriptor, - SqlTableInferrerProperties, - SqlTableInputFormatDescriptor + SqlQueryInferrerInput, + SqlQueryInferrerOutput, + SqlTableInferrerInput, + SqlTableInferrerOutput } import com.rawlabs.utils.sources.jdbc.mysql.{MySqlServerLocation, MySqlTableLocation} @@ -128,7 +128,7 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { private def getTableInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val table = getStringValue(mandatoryArgs(1)) val location = @@ -155,7 +155,7 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlTableInferrerProperties(location, None)) + Right(SqlTableInferrerInput(location, None)) } override def returnType( @@ -166,7 +166,7 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { for ( inferrerProperties <- getTableInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlTableInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } @@ -373,7 +373,7 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { private def getQueryInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val query = getStringValue(mandatoryArgs(1)) val location = @@ -400,7 +400,7 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlQueryInferrerProperties(location, query, None)) + Right(SqlQueryInferrerInput(location, query, None)) } override def returnType( @@ -411,7 +411,7 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { for ( inferrerProperties <- getQueryInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlQueryInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullablePackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullablePackage.scala index 007e8e7af..b10525170 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullablePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullablePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, @@ -27,6 +27,33 @@ import com.rawlabs.snapi.frontend.rql2.api.{ TypeParam } +object NullablePackageBuilder { + + object Empty { + def apply(t: Type): Exp = { + FunApp(Proj(PackageIdnExp("Nullable"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) + } + } + + object UnsafeGet { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Nullable"), "UnsafeGet"), Vector(FunAppArg(e, None))) + } + } + + object Build { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Nullable"), "Build"), Vector(FunAppArg(e, None))) + } + } + + object Transform { + def apply(f: Exp, e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Nullable"), "Transform"), Vector(FunAppArg(f, None), FunAppArg(e, None))) + } + } +} + class NullablePackage extends PackageExtension { override def name: String = "Nullable" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullableTryablePackage.scala similarity index 82% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullableTryablePackage.scala index f398c6738..2e652eddd 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/NullableTryablePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullableTryablePackage.scala @@ -10,15 +10,24 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.typesafe.scalalogging.StrictLogging import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object NullableTryablePackageBuilder { + + object FlatMap { + def apply(e: Exp, f: Exp): Exp = { + FunApp(Proj(PackageIdnExp("NullableTryable"), "FlatMap"), Vector(FunAppArg(e, None), FunAppArg(f, None))) + } + } +} + class NullableTryablePackage extends PackageExtension { override def name: String = "NullableTryable" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/OraclePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/OraclePackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/OraclePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/OraclePackage.scala index 1eed2456f..63b8886cd 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/OraclePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/OraclePackage.scala @@ -10,33 +10,31 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, - Rql2StringValue, SugarEntryExtension, TypeArg, TypeParam, ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.ProgramContext +import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2StringValue} import com.rawlabs.snapi.frontend.inferrer.api.{ - SqlQueryInferrerProperties, - SqlQueryInputFormatDescriptor, - SqlTableInferrerProperties, - SqlTableInputFormatDescriptor + SqlQueryInferrerInput, + SqlQueryInferrerOutput, + SqlTableInferrerInput, + SqlTableInferrerOutput } import com.rawlabs.utils.sources.jdbc.oracle.{OracleServerLocation, OracleTableLocation} @@ -147,7 +145,7 @@ class OracleInferAndReadEntry extends SugarEntryExtension { private def getTableInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val schema = getStringValue(mandatoryArgs(1)) val table = getStringValue(mandatoryArgs(2)) @@ -175,7 +173,7 @@ class OracleInferAndReadEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlTableInferrerProperties(location, None)) + Right(SqlTableInferrerInput(location, None)) } override def returnType( @@ -186,7 +184,7 @@ class OracleInferAndReadEntry extends SugarEntryExtension { for ( inferrerProperties <- getTableInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlTableInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } @@ -402,7 +400,7 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { private def getQueryInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val query = getStringValue(mandatoryArgs(1)) val location = @@ -429,7 +427,7 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlQueryInferrerProperties(location, query, None)) + Right(SqlQueryInferrerInput(location, query, None)) } override def returnType( @@ -440,7 +438,7 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { for ( inferrerProperties <- getQueryInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlQueryInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/PostgreSQLPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/PostgreSQLPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/PostgreSQLPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/PostgreSQLPackage.scala index 6e13e65cd..da7608b2c 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/PostgreSQLPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/PostgreSQLPackage.scala @@ -10,21 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, - Rql2StringValue, SugarEntryExtension, TypeArg, TypeParam, @@ -33,10 +32,10 @@ import com.rawlabs.snapi.frontend.rql2.api.{ } import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.inferrer.api.{ - SqlQueryInferrerProperties, - SqlQueryInputFormatDescriptor, - SqlTableInferrerProperties, - SqlTableInputFormatDescriptor + SqlQueryInferrerInput, + SqlQueryInferrerOutput, + SqlTableInferrerInput, + SqlTableInferrerOutput } import com.rawlabs.utils.sources.jdbc.pgsql.{PostgresqlServerLocation, PostgresqlTableLocation} @@ -147,7 +146,7 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { private def getTableInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val schema = getStringValue(mandatoryArgs(1)) val table = getStringValue(mandatoryArgs(2)) @@ -183,7 +182,7 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlTableInferrerProperties(location, None)) + Right(SqlTableInferrerInput(location, None)) } override def returnType( @@ -194,7 +193,7 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { for ( inferrerProperties <- getTableInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlTableInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } @@ -412,7 +411,7 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { private def getQueryInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val query = getStringValue(mandatoryArgs(1)) val location = @@ -439,7 +438,7 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlQueryInferrerProperties(location, query, None)) + Right(SqlQueryInferrerInput(location, query, None)) } override def returnType( @@ -450,7 +449,7 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { for ( inferrerProperties <- getQueryInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlQueryInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RecordPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RecordPackage.scala index bc4ff2423..0c645a2de 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RecordPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RecordPackage.scala @@ -10,16 +10,58 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, ValueParam} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpArg, + ExpParam, + PackageExtension, + Param, + ValueParam +} import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.source.{Rql2RecordType, _} +object RecordPackageBuilder { + object Build { + def apply(atts: Vector[(String, Exp)]): Exp = { + FunApp(Proj(PackageIdnExp("Record"), "Build"), atts.map { case (idn, e) => FunAppArg(e, Some(idn)) }.to) + } + def apply(atts: Exp*): Exp = { + FunApp( + Proj(PackageIdnExp("Record"), "Build"), + atts.zipWithIndex.map { case (e, idx) => FunAppArg(e, Some(s"_${idx + 1}")) }.to + ) + } + def unapply(e: Exp): Option[Vector[(String, Exp)]] = e match { + case FunApp(Proj(PackageIdnExp("Record"), "Build"), atts) => + Some(atts.map { case FunAppArg(e, Some(idn)) => (idn, e) }) + case _ => None + } + } + + object AddField { + def apply(r: Exp, e: Exp, name: String) = + FunApp(Proj(PackageIdnExp("Record"), "AddField"), Vector(FunAppArg(r, None), FunAppArg(e, Some(name)))) + } + + object Concat { + def apply(r1: Exp, r2: Exp) = + FunApp(Proj(PackageIdnExp("Record"), "Concat"), Vector(FunAppArg(r1, None), FunAppArg(r2, None))) + } + + object GetFieldByIndex { + def apply(r: Exp, idx: Exp) = + FunApp(Proj(PackageIdnExp("Record"), "GetFieldByIndex"), Vector(FunAppArg(r, None), FunAppArg(idx, None))) + } +} + class RecordPackage extends PackageExtension { override def name: String = "Record" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RegexPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RegexPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RegexPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RegexPackage.scala index d1f60477d..e52e3513e 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/RegexPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RegexPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source.{ Rql2BoolType, Rql2IsNullableTypeProperty, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/S3Package.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/S3Package.scala similarity index 94% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/S3Package.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/S3Package.scala index 2b79d5335..3a7ce6e6d 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/S3Package.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/S3Package.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2.source.{Rql2LocationType, Rql2StringType} import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class S3Package extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SQLServerPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SQLServerPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SQLServerPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SQLServerPackage.scala index 28b164737..4661bdc21 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SQLServerPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SQLServerPackage.scala @@ -10,21 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, - Rql2StringValue, SugarEntryExtension, TypeArg, TypeParam, @@ -33,10 +32,10 @@ import com.rawlabs.snapi.frontend.rql2.api.{ } import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.inferrer.api.{ - SqlQueryInferrerProperties, - SqlQueryInputFormatDescriptor, - SqlTableInferrerProperties, - SqlTableInputFormatDescriptor + SqlQueryInferrerInput, + SqlQueryInferrerOutput, + SqlTableInferrerInput, + SqlTableInferrerOutput } import com.rawlabs.utils.sources.jdbc.sqlserver.{SqlServerServerLocation, SqlServerTableLocation} @@ -148,7 +147,7 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { private def getTableInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val schema = getStringValue(mandatoryArgs(1)) val table = getStringValue(mandatoryArgs(2)) @@ -184,7 +183,7 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlTableInferrerProperties(location, None)) + Right(SqlTableInferrerInput(location, None)) } override def returnType( @@ -195,7 +194,7 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { for ( inferrerProperties <- getTableInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlTableInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } @@ -414,7 +413,7 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { private def getQueryInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val query = getStringValue(mandatoryArgs(1)) val location = @@ -441,7 +440,7 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlQueryInferrerProperties(location, query, None)) + Right(SqlQueryInferrerInput(location, query, None)) } override def returnType( @@ -452,7 +451,7 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { for ( inferrerProperties <- getQueryInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlQueryInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, false, false) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ShortPackage.scala similarity index 86% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ShortPackage.scala index ad28fd590..a911f934c 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/ShortPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ShortPackage.scala @@ -10,14 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} import com.rawlabs.snapi.frontend.rql2.source._ +object ShortPackageBuilder { + + object From { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Short"), "From"), Vector(FunAppArg(e, None))) + } + } +} + class ShortPackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SnowflakePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SnowflakePackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SnowflakePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SnowflakePackage.scala index 230b80e76..a24f18fc3 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SnowflakePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SnowflakePackage.scala @@ -10,26 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param, - Rql2ListValue, - Rql2OptionValue, - Rql2RecordAttr, - Rql2RecordValue, - Rql2StringValue, SugarEntryExtension, TypeArg, TypeParam, @@ -37,10 +32,10 @@ import com.rawlabs.snapi.frontend.rql2.api.{ ValueParam } import com.rawlabs.snapi.frontend.inferrer.api.{ - SqlQueryInferrerProperties, - SqlQueryInputFormatDescriptor, - SqlTableInferrerProperties, - SqlTableInputFormatDescriptor + SqlQueryInferrerInput, + SqlQueryInferrerOutput, + SqlTableInferrerInput, + SqlTableInferrerOutput } import com.rawlabs.utils.sources.jdbc.snowflake.{SnowflakeServerLocation, SnowflakeTableLocation} @@ -175,7 +170,7 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { private def getTableInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlTableInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val schema = getStringValue(mandatoryArgs(1)) val table = getStringValue(mandatoryArgs(2)) @@ -216,7 +211,7 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlTableInferrerProperties(location, None)) + Right(SqlTableInferrerInput(location, None)) } override def returnType( @@ -227,7 +222,7 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { for ( inferrerProperties <- getTableInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlTableInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, makeNullable = false, makeTryable = false) } @@ -473,7 +468,7 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { private def getQueryInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerProperties] = { + )(implicit programContext: ProgramContext): Either[String, SqlQueryInferrerInput] = { val db = getStringValue(mandatoryArgs(0)) val query = getStringValue(mandatoryArgs(1)) val parameters = @@ -507,7 +502,7 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { case None => return Left(s"unknown credential: $db") } } - Right(SqlQueryInferrerProperties(location, query, None)) + Right(SqlQueryInferrerInput(location, query, None)) } override def returnType( @@ -518,7 +513,7 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { for ( inferrerProperties <- getQueryInferrerProperties(mandatoryArgs, optionalArgs); inputFormatDescriptor <- programContext.infer(inferrerProperties); - SqlQueryInputFormatDescriptor(tipe) = inputFormatDescriptor + SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { inferTypeToRql2Type(tipe, makeNullable = false, makeTryable = false) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/StringPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/StringPackage.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/StringPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/StringPackage.scala index 75a3f6bf3..72d52e036 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/StringPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/StringPackage.scala @@ -10,13 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension +} import com.rawlabs.snapi.frontend.rql2.source._ class StringPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SuccessPackage.scala similarity index 75% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SuccessPackage.scala index a7cf9e74b..c8a1a7a1f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/SuccessPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SuccessPackage.scala @@ -10,13 +10,30 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source.{Rql2IsTryableTypeProperty, Rql2TypeWithProperties} +import com.rawlabs.snapi.frontend.rql2.source.{ + Exp, + FunApp, + FunAppArg, + PackageIdnExp, + Proj, + Rql2IsTryableTypeProperty, + Rql2TypeWithProperties +} import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} + +object SuccessPackageBuilder { + + object Build { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Success"), "Build"), Vector(FunAppArg(e, None))) + } + } +} class SuccessPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TestPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TestPackage.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TestPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TestPackage.scala index 7d93240c3..81ea0abdb 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TestPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TestPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.source.Type import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api._ +import com.rawlabs.snapi.frontend.rql2.extensions._ import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.common.source.Exp +import com.rawlabs.snapi.frontend.rql2.source.Exp class TestPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimePackage.scala similarity index 90% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimePackage.scala index ef0c2e5e3..d9818a655 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimePackage.scala @@ -10,14 +10,45 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} -import com.rawlabs.snapi.frontend.rql2.api.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, ShortEntryExtension} import com.rawlabs.snapi.frontend.rql2.source._ +import java.time.{LocalDate, LocalTime} import scala.collection.immutable.ListMap +object TimePackageBuilder { + + object FromLocalTime { + def apply(t: LocalTime): Exp = { + FunApp( + Proj(PackageIdnExp("Time"), "Build"), + Vector( + FunAppArg(IntConst(t.getHour.toString), None), + FunAppArg(IntConst(t.getMinute.toString), None), + FunAppArg(IntConst(t.getSecond.toString), Some("seconds")), + FunAppArg(IntConst((t.getNano / 1000000).toString), Some("millis")) + ) + ) + } + } + + object FromLocalDate { + def apply(d: LocalDate): Exp = { + FunApp( + Proj(PackageIdnExp("Date"), "Build"), + Vector( + FunAppArg(IntConst(d.getYear.toString), None), + FunAppArg(IntConst(d.getMonthValue.toString), None), + FunAppArg(IntConst(d.getDayOfMonth.toString), None) + ) + ) + } + } +} + class TimePackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimestampPackage.scala similarity index 94% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimestampPackage.scala index 826bc6268..0681b465b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TimestampPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimestampPackage.scala @@ -10,17 +10,52 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, ShortEntryExtension} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + ShortEntryExtension +} +import java.time.LocalDateTime import scala.collection.immutable.ListMap +object TimestampPackageBuilder { + + object FromDate { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Timestamp"), "FromDate"), Vector(FunAppArg(e, None))) + } + } + + object FromLocalDateTime { + def apply(d: LocalDateTime): Exp = { + FunApp( + Proj(PackageIdnExp("Timestamp"), "Build"), + Vector( + FunAppArg(IntConst(d.getYear.toString), None), + FunAppArg(IntConst(d.getMonthValue.toString), None), + FunAppArg(IntConst(d.getDayOfMonth.toString), None), + FunAppArg(IntConst(d.getHour.toString), None), + FunAppArg(IntConst(d.getMinute.toString), None), + FunAppArg(IntConst(d.getSecond.toString), Some("seconds")), + FunAppArg(IntConst((d.getNano / 1000000).toString), Some("millis")) + ) + ) + } + } + +} + class TimestampPackage extends PackageExtension { /** diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TryPackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TryPackage.scala index b40008141..f9479288c 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TryPackage.scala @@ -10,13 +10,34 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param} + +object TryPackageBuilder { + + object Transform { + def apply(f: Exp, e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Try"), "Transform"), Vector(FunAppArg(f, None), FunAppArg(e, None))) + } + } + object FlatMap { + def apply(f: Exp, e: Exp): Exp = { + FunApp(Proj(IdnExp("Try"), "FlatMap"), Vector(FunAppArg(f, None), FunAppArg(e, None))) + } + } + + object UnsafeGet { + def apply(e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Try"), "UnsafeGet"), Vector(FunAppArg(e, None))) + } + } + +} class TryPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TypePackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TypePackage.scala index 32ca6f27b..02cf3d9ec 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/TypePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TypePackage.scala @@ -10,15 +10,40 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, EntryExtension, ExpParam, PackageExtension, Param, TypeArg, TypeParam} +import com.rawlabs.snapi.frontend.rql2.extensions.{ + Arg, + EntryExtension, + ExpParam, + PackageExtension, + Param, + TypeArg, + TypeParam +} import com.rawlabs.snapi.frontend.rql2.source._ +object TypePackageBuilder { + + def Cast(t: Type, e: Exp): Exp = { + FunApp(Proj(PackageIdnExp("Type"), "Cast"), Vector(FunAppArg(TypeExp(t), None), FunAppArg(e, None))) + } + + def ProtectCast(actual: Type, target: Type, e: Exp): Exp = { + FunApp( + Proj(PackageIdnExp("Type"), "ProtectCast"), + Vector(FunAppArg(TypeExp(actual), None), FunAppArg(TypeExp(target), None), FunAppArg(e, None)) + ) + } + def Empty(t: Type): Exp = { + FunApp(Proj(PackageIdnExp("Type"), "Empty"), Vector(FunAppArg(TypeExp(t), None))) + } +} + class TypePackage extends PackageExtension { override def name: String = "Type" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/XmlPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/XmlPackage.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/XmlPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/XmlPackage.scala index 74caeb870..9414fbcbb 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/builtin/XmlPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/XmlPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.builtin +package com.rawlabs.snapi.frontend.rql2.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.api.{ +import com.rawlabs.snapi.frontend.rql2.extensions.{ Arg, EntryExtension, EntryExtensionHelper, @@ -114,10 +114,10 @@ class InferAndReadXmlEntry extends SugarEntryExtension with XmlEntryExtensionHel for ( descriptor <- inferenceDiagnostic; - TextInputStreamFormatDescriptor( + TextInputStreamInferrerOutput( _, _, - XmlInputFormatDescriptor(dataType, sampled, _, _, _) + XmlFormatDescriptor(dataType, sampled, _, _, _) ) = descriptor; rql2Type = inferTypeToRql2Type(dataType, makeNullable = preferNulls && sampled, makeTryable = sampled); okType <- validateXmlType(rql2Type) @@ -143,10 +143,10 @@ class InferAndReadXmlEntry extends SugarEntryExtension with XmlEntryExtensionHel inputFormatDescriptor } - val TextInputStreamFormatDescriptor( + val TextInputStreamInferrerOutput( encoding, _, - XmlInputFormatDescriptor( + XmlFormatDescriptor( _, _, timeFormat, @@ -176,9 +176,9 @@ trait XmlEntryExtensionHelper extends EntryExtensionHelper { protected def getXmlInferrerProperties( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)] - ): Either[String, XmlInferrerProperties] = { + ): Either[String, XmlInferrerInput] = { getByteStreamLocation(mandatoryArgs.head).right.map { location => - XmlInferrerProperties( + XmlInferrerInput( location, optionalArgs.collectFirst { case a if a._1 == "sampleSize" => a._2 }.map(getIntValue), optionalArgs diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala deleted file mode 100644 index 4e92b9c36..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/lsp/LspSyntaxAnalyzer.scala +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.lsp - -import org.bitbucket.inkytonik.kiama.util.Positions -import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.{FrontendSyntaxAnalyzer, ParsedNamedAttribute, ParsedUnnamedAttribute} -import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzerTokens._ -import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} -import com.rawlabs.snapi.frontend.rql2.source._ - -/** - * Version of the FrontendSyntaxAnalyzer that accepts "broken code" but still tries to parse it successfully, - * so that we can still obtain an AST and type it for LSP actions. - * - * Whenever an Exp cannot be parsed, it is replaced by ErrorExp - */ -class LspSyntaxAnalyzer(positions: Positions) extends FrontendSyntaxAnalyzer(positions) { - - final override lazy val program: Parser[BaseProgram] = rep(rql2Method) ~ opt(exp) ^^ { - case ms ~ me => Rql2Program(ms, me) - } - - final override protected def exp8: PackratParser[Exp] = exp8Attr - - final private lazy val exp8Attr: PackratParser[Exp] = { - exp8Attr <~ "(" <~ ")" ^^ { f => FunApp(f, Vector.empty) } | - exp8Attr ~ ("(" ~> rep1sep(funAppArg, ",") <~ ")") ^^ { case f ~ args => FunApp(f, args) } | - exp8Attr ~ ("." ~> identDef) ^^ { case e ~ idn => Proj(e, idn) } | - // FunApp closing parenthesis is optional - exp8Attr ~ ("(" ~> rep1sep(funAppArg, ",")) ^^ { case f ~ args => FunApp(f, args) } | - // FunApp closing parenthesis is optional - exp8Attr <~ "(" ^^ { f => FunApp(f, Vector.empty) } | - /// Dot is optional - exp8Attr <~ "." ^^ { e => Proj(e, "") } | - baseExp - } - - // Always succeed on types: last case is ErrorType() instead of failure - - final override lazy val baseType: Parser[Type] = baseTypeAttr | - success(ErrorType()) - - // Always succeed on expressions: last case is ErrorExp() instead of failure - final override protected def baseExp: PackratParser[Exp] = baseExpAttr - - final private lazy val baseExpAttr: PackratParser[Exp] = { - let | - funAbs | - typeExp | - ifThenElse | - nullConst | - boolConst | - // Because of the way we parse strings, we need to try triple quotes first - tripleQStringConst | - stringConst | - numberConst | - lists | - records | - idnExp | - "(" ~> exp <~ opt(")") | // Closing parenthesis is optional - success(ErrorExp()) - } - - final override protected def ifThenElse: Parser[IfThenElse] = ifThenElseAttr - - final private lazy val ifThenElseAttr: Parser[IfThenElse] = { - // Partially written "if-then-else", i.e. "then" or "else" parts missing - tokIf ~> exp ~ opt(tokThen ~> exp) ~ opt( - tokElse ~> exp - ) ^^ { case e1 ~ me2 ~ me3 => IfThenElse(e1, me2.getOrElse(ErrorExp()), me3.getOrElse(ErrorExp())) } - } - - final override protected def let: Parser[Let] = letAttr - - final private lazy val letAttr: Parser[Let] = { - // Partially written "let", i.e. "in" part missing - (tokLet ~> repsep(letDecl, rep1(","))) ~ (opt(",") ~> opt(tokIn) ~> exp) ^^ { case d ~ e => Let(d, e) } - } - - // Closing bracket is optional - final override protected lazy val lists: Parser[Exp] = "[" ~> repsep(exp, ",") <~ opt("]") ^^ { atts => - ListPackageBuilder.Build(atts: _*) - } - - // Closing brace is optional - final override protected lazy val records: Parser[Exp] = "{" ~> repsep(attr, ",") <~ opt("}") ^^ { atts => - RecordPackageBuilder.Build(atts.zipWithIndex.map { - case (attr, idx) => attr match { - case ParsedNamedAttribute(idn, e) => idn -> e - case ParsedUnnamedAttribute(e) => s"_${idx + 1}" -> e - } - }) - } -} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/package.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/package.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/package.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/package.scala index 7ffb3cfa8..83b4c8cf3 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/utils/package.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/package.scala @@ -14,7 +14,7 @@ package com.rawlabs.snapi.frontend import java.nio.file.Path -package object utils { +package object rql2 { /** * An interpolator for RQL code. diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ImplicitCasts.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ImplicitCastsPhase.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ImplicitCasts.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ImplicitCastsPhase.scala index 038a6218d..a37b15d31 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ImplicitCasts.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ImplicitCastsPhase.scala @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.rql2.phases -import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ -import org.bitbucket.inkytonik.kiama.rewriting.Strategy import com.rawlabs.snapi.frontend.base.Phase import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.builtin._ import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin._ +import com.rawlabs.snapi.frontend.rql2.{PipelinedPhase, Rql2TypeUtils, Tree} +import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ +import org.bitbucket.inkytonik.kiama.rewriting.Strategy /** * Applies implicit casts to core nodes of the language. */ -class ImplicitCasts(protected val parent: Phase[SourceProgram], protected val phaseName: String)( +class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected val phaseName: String)( protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase with Rql2TypeUtils { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ListProjDesugarer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ListProjDesugarerPhase.scala similarity index 84% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ListProjDesugarer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ListProjDesugarerPhase.scala index ce97d87c8..7e4b8fa39 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ListProjDesugarer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ListProjDesugarerPhase.scala @@ -10,17 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.rql2.phases +import com.rawlabs.snapi.frontend.base.Phase +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{CollectionPackageBuilder, ListPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.{PipelinedPhase, Tree} import org.bitbucket.inkytonik.kiama.rewriting.Cloner.attempt import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy -import com.rawlabs.snapi.frontend.base.Phase -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.builtin.{CollectionPackageBuilder, ListPackageBuilder} -import com.rawlabs.snapi.frontend.rql2.source._ -class ListProjDesugarer(protected val parent: Phase[SourceProgram], protected val phaseName: String)( +class ListProjDesugarerPhase(protected val parent: Phase[SourceProgram], protected val phaseName: String)( protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Propagation.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/PropagationPhase.scala similarity index 95% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Propagation.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/PropagationPhase.scala index 850812a96..b38ce3f68 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Propagation.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/PropagationPhase.scala @@ -10,21 +10,27 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.rql2.phases -import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ -import org.bitbucket.inkytonik.kiama.rewriting.Strategy import com.rawlabs.snapi.frontend.base.Phase import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api.{Arg, Rql2Value, ValueArg} -import com.rawlabs.snapi.frontend.rql2.builtin._ import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, ValueArg} +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ + NullablePackageBuilder, + NullableTryablePackageBuilder, + SuccessPackageBuilder, + TryPackageBuilder, + TypePackageBuilder +} +import com.rawlabs.snapi.frontend.rql2.{FunAppPackageEntryArguments, PipelinedPhase, Rql2TypeUtils, Rql2Value, Tree} +import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ +import org.bitbucket.inkytonik.kiama.rewriting.Strategy /** * Rewrites the tree in order to propagate nullables and errors. */ -class Propagation(protected val parent: Phase[SourceProgram], protected val phaseName: String)( +class PropagationPhase(protected val parent: Phase[SourceProgram], protected val phaseName: String)( protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase with Rql2TypeUtils { @@ -37,15 +43,6 @@ class Propagation(protected val parent: Phase[SourceProgram], protected val phas val tree = new Tree(program) lazy val analyzer = tree.analyzer - case class TypeAndValue(t: Type, value: Option[Rql2Value]) - case class ExpProps( - ne: Exp, - t: Type, - castNeeded: Boolean, - props: Set[Rql2TypeProperty], - value: Option[Rql2Value] = None - ) - // Returns the type of argument at index `idx`. If the index points to a ValueArg, // add the computed value def getTypeAndValue( @@ -338,3 +335,13 @@ class Propagation(protected val parent: Phase[SourceProgram], protected val phas } } + +private case class TypeAndValue(t: Type, value: Option[Rql2Value]) + +private case class ExpProps( + ne: Exp, + t: Type, + castNeeded: Boolean, + props: Set[Rql2TypeProperty], + value: Option[Rql2Value] = None +) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SugarExtensionDesugarer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/SugarExtensionDesugarerPhase.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SugarExtensionDesugarer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/SugarExtensionDesugarerPhase.scala index 7491e0de7..b4292840f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SugarExtensionDesugarer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/SugarExtensionDesugarerPhase.scala @@ -10,19 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.rql2.phases -import com.rawlabs.compiler.CompilerException -import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ -import org.bitbucket.inkytonik.kiama.rewriting.Strategy import com.rawlabs.snapi.frontend.base.Phase import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.api.SugarEntryExtension import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.rql2.extensions.SugarEntryExtension +import com.rawlabs.snapi.frontend.rql2.{FunAppPackageEntryArguments, PipelinedPhase, Tree} +import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ +import org.bitbucket.inkytonik.kiama.rewriting.Strategy -class SugarExtensionDesugarer(protected val parent: Phase[SourceProgram], protected val phaseName: String)( +class SugarExtensionDesugarerPhase(protected val parent: Phase[SourceProgram], protected val phaseName: String)( protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase { @@ -60,7 +59,7 @@ class SugarExtensionDesugarer(protected val parent: Phase[SourceProgram], protec // The code call to this package extension isn't typing (wrong parameters?) // Report the error. That can happen when developing of a sugar package extension. // Wrong desugaring isn't caught otherwise. - throw new CompilerException(s"SugarExtensionDesugarer failed while desugaring $pkgName.$i: $error") + throw new AssertionError(s"SugarExtensionDesugarer failed while desugaring $pkgName.$i: $error") } ent.desugar(analyzer.tipe(f), nargs, mandatoryArgs, optionalArgs, varArgs) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala index 2985a7126..a5d5e2c38 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala @@ -17,7 +17,7 @@ import org.bitbucket.inkytonik.kiama.util.Trampolines.Done import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} import com.rawlabs.snapi.frontend.base.source.BaseNode import com.rawlabs.snapi.frontend.rql2.antlr4.{CommentsAntlrSyntaxAnalyzer, NodeComments} -import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import java.util import scala.collection.JavaConverters._ diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala index a7da8a855..8cfc05695 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala @@ -16,10 +16,8 @@ import com.rawlabs.utils.core.RawUtils import org.bitbucket.inkytonik.kiama.output._ import com.rawlabs.snapi.frontend.base import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.common.source._ -import com.rawlabs.snapi.frontend.rql2.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import com.rawlabs.snapi.frontend.rql2.{Keywords, Rql2TypeUtils} -import com.rawlabs.utils.core._ import scala.collection.mutable @@ -312,7 +310,6 @@ trait SourcePrettyPrinter case e: CommonExp => commonExp(e) case i: CommonIdnNode => idnToDoc(i) case SourceProgramParam(i, t) => toDoc(i) <> ":" <+> t - case Bind(e, i) => toDoc(i) <+> ":=" <+> toDoc(e) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala index 1e37ad6cc..7f9bb66fc 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala @@ -13,8 +13,142 @@ package com.rawlabs.snapi.frontend.rql2.source import org.bitbucket.inkytonik.kiama.output._ +import org.bitbucket.inkytonik.kiama.output.PrettyExpression import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.common.source._ +import com.rawlabs.snapi.frontend.base.Counter +import com.rawlabs.snapi.frontend.base.source._ + +trait SourceNode extends BaseNode + +object SourceTree { + import org.bitbucket.inkytonik.kiama.relation.Tree + + type SourceTree = Tree[SourceNode, SourceProgram] +} + +/** + * Top-level source node. + */ +trait SourceProgram extends SourceNode with BaseProgram { + def params: Vector[SourceProgramParam] + def comment: Option[String] = None +} + +final case class SourceProgramParam(idn: CommonIdnNode, t: Type) extends CommonNode + +/** + * Qualifiers + */ +// TODO (msb): These are best called "Statements" because that's (also?) what they are +// Qual is more general than Stmt: a Gen is a Qual but not a Stmt while Bind is +trait Qual extends SourceNode + +/** + * Declarations + */ +trait Decl extends SourceNode with Qual + +/** + * Expressions + */ +trait Exp extends SourceNode with Qual with PrettyExpression + +/** + * * From now on are "common language"-related nodes. ** + */ + +/** + * Parent of all "common language" nodes. + */ +trait CommonNode extends SourceNode + +/** + * Parent of all "common language" types. + */ +trait CommonType extends Type with CommonNode + +/** + * Any Type + * The top type. + */ +final case class AnyType() extends CommonType + +/** + * Nothing Type + * The bottom type. + */ +final case class NothingType() extends CommonType + +/** + * This type is used when the tree has errors. + */ +final case class ErrorType() extends CommonType + +/** + * Parent of all "common language" expressions. + */ +trait CommonExp extends Exp with CommonNode + +/////////////////////////////////////////////////////////////////////////// +// Type Constraints +/////////////////////////////////////////////////////////////////////////// + +trait CommonTypeConstraint extends CommonType + +/** + * One-of Type constraint. + */ +final case class OneOfType(tipes: Vector[Type]) extends CommonTypeConstraint + +object OneOfType { + def apply(tipes: Type*): OneOfType = { + OneOfType(tipes.toVector) + } +} + +final case class ExpectedRecordType(idns: Set[String]) extends CommonTypeConstraint + +/////////////////////////////////////////////////////////////////////////// +// Identifiers +/////////////////////////////////////////////////////////////////////////// + +abstract class CommonIdnNode extends BaseIdnNode with CommonNode + +/** + * Defining occurrence of an identifier + */ +final case class IdnDef(idn: String) extends CommonIdnNode + +object IdnDef { + def apply(): IdnDef = IdnDef(Counter.next("common")) +} + +/** + * Use of an identifier + */ +final case class IdnUse(idn: String) extends CommonIdnNode + +object IdnUse { + def apply(i: IdnDef): IdnUse = IdnUse(i.idn) +} + +/** + * Identifier expression + */ +final case class IdnExp(idn: IdnUse) extends CommonExp + +object IdnExp { + def apply(i: IdnDef): IdnExp = IdnExp(IdnUse(i.idn)) + def apply(i: String): IdnExp = IdnExp(IdnUse(i)) + def apply(p: SourceProgramParam): IdnExp = IdnExp(p.idn.idn) + def apply(p: BaseIdnNode): IdnExp = IdnExp(p.idn) +} + +/////////////////////////////////////////////////////////////////////////// +// Expressions +/////////////////////////////////////////////////////////////////////////// + +final case class ErrorExp() extends CommonExp /////////////////////////////////////////////////////////////////////////// // RQL2 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 9e9bdfe7b..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 @@ -44,8 +44,8 @@ class LocalInferrerTest extends RawTestSuite with SettingsTestContext with Stric val l1 = new LocalPath(f.toPath) val inferrer = new LocalInferrerService try { - val TextInputStreamFormatDescriptor(detectedEncoding, _, LinesInputFormatDescriptor(_, _, _)) = - inferrer.infer(AutoInferrerProperties(l1, None)) + val TextInputStreamInferrerOutput(detectedEncoding, _, LinesFormatDescriptor(_, _, _)) = + inferrer.infer(AutoInferrerInput(l1, None)) assert(detectedEncoding == encoding) } finally { RawUtils.withSuppressNonFatalException(inferrer.stop()) @@ -71,7 +71,7 @@ class LocalInferrerTest extends RawTestSuite with SettingsTestContext with Stric ex.submit(new Runnable { override def run(): Unit = { val file = files(Random.nextInt(3)) - inferrer.infer(AutoInferrerProperties(file, None)) + inferrer.infer(AutoInferrerInput(file, None)) } }) } @@ -81,130 +81,4 @@ class LocalInferrerTest extends RawTestSuite with SettingsTestContext with Stric } } - test("test pretty printer") { _ => - val tipe = SourceRecordType( - Vector( - SourceAttrType("nhits", SourceIntType(false)), - SourceAttrType( - "parameters", - SourceRecordType( - Vector( - SourceAttrType("dataset", SourceCollectionType(SourceStringType(false), false)), - SourceAttrType("rows", SourceIntType(false)), - SourceAttrType("start", SourceIntType(false)), - SourceAttrType("format", SourceStringType(false)), - SourceAttrType("timezone", SourceStringType(false)) - ), - false - ) - ), - SourceAttrType( - "records", - SourceCollectionType( - SourceRecordType( - Vector( - SourceAttrType("datasetid", SourceStringType(false)), - SourceAttrType("recordid", SourceStringType(false)), - SourceAttrType( - "fields", - SourceRecordType( - Vector( - SourceAttrType("fiche_identite", SourceStringType(false)), - SourceAttrType("statut", SourceStringType(false)), - SourceAttrType("code_ape", SourceStringType(false)), - SourceAttrType("siren", SourceStringType(false)), - SourceAttrType("date_immatriculation", SourceStringType(false)), - SourceAttrType("geolocalisation", SourceCollectionType(SourceDoubleType(false), true)), - SourceAttrType("ville", SourceStringType(false)), - SourceAttrType("adresse", SourceStringType(false)), - SourceAttrType("code_postal", SourceStringType(false)), - SourceAttrType("departement", SourceStringType(false)), - SourceAttrType("denomination", SourceStringType(false)), - SourceAttrType("devise", SourceStringType(false)), - SourceAttrType("nic", SourceStringType(false)), - SourceAttrType("forme_juridique", SourceStringType(false)), - SourceAttrType("secteur_d_activite", SourceStringType(false)), - SourceAttrType("sigle", SourceStringType(true)), - SourceAttrType("region", SourceStringType(false)), - SourceAttrType("date_de_publication", SourceStringType(false)), - SourceAttrType("num_dept", SourceStringType(false)), - SourceAttrType("etat", SourceStringType(false)), - SourceAttrType("greffe", SourceStringType(false)), - SourceAttrType("code_greffe", SourceStringType(false)), - SourceAttrType("etat_pub", SourceStringType(false)), - SourceAttrType("date_immatriculation_origine", SourceStringType(true)) - ), - false - ) - ), - SourceAttrType( - "geometry", - SourceRecordType( - Vector( - SourceAttrType("type", SourceStringType(false)), - SourceAttrType("coordinates", SourceCollectionType(SourceDoubleType(false), false)) - ), - true - ) - ), - SourceAttrType("record_timestamp", SourceStringType(false)) - ), - false - ), - false - ) - ) - ), - false - ) - val inferrer = new LocalInferrerService - try { - val result = inferrer.prettyPrint(tipe) - assert( - result === - """record( - | `nhits`: int, - | `parameters`: record( - | `dataset`: collection(string), - | `rows`: int, - | `start`: int, - | `format`: string, - | `timezone`: string), - | `records`: collection(record( - | `datasetid`: string, - | `recordid`: string, - | `fields`: record( - | `fiche_identite`: string, - | `statut`: string, - | `code_ape`: string, - | `siren`: string, - | `date_immatriculation`: string, - | `geolocalisation`: collection(double) nullable, - | `ville`: string, - | `adresse`: string, - | `code_postal`: string, - | `departement`: string, - | `denomination`: string, - | `devise`: string, - | `nic`: string, - | `forme_juridique`: string, - | `secteur_d_activite`: string, - | `sigle`: string nullable, - | `region`: string, - | `date_de_publication`: string, - | `num_dept`: string, - | `etat`: string, - | `greffe`: string, - | `code_greffe`: string, - | `etat_pub`: string, - | `date_immatriculation_origine`: string nullable), - | `geometry`: record( - | `type`: string, - | `coordinates`: collection(double)) nullable, - | `record_timestamp`: string)))""".stripMargin - ) - } finally { - RawUtils.withSuppressNonFatalException(inferrer.stop()) - } - } } diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260Test.scala similarity index 91% rename from snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260Test.scala index af260cee4..555878486 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10260Test.scala @@ -18,7 +18,8 @@ import com.rawlabs.snapi.frontend.inferrer.api._ import com.rawlabs.snapi.frontend.inferrer.local.json.JsonInferrer import java.io.StringReader -class RD10260 extends RawTestSuite with SettingsTestContext with StrictLogging { + +class RD10260Test extends RawTestSuite with SettingsTestContext with StrictLogging { test("Infer or-type starting on a record") { _ => val json = """[ @@ -29,7 +30,7 @@ class RD10260 extends RawTestSuite with SettingsTestContext with StrictLogging { |]""".stripMargin val inferrer = new JsonInferrer val reader = new StringReader(json) - val JsonInputFormatDescriptor(tipe, _, _, _, _) = inferrer.infer(reader, None) + val JsonFormatDescriptor(tipe, _, _, _, _) = inferrer.infer(reader, None) val expected = SourceCollectionType( SourceRecordType( Vector( diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439Test.scala similarity index 95% rename from snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439Test.scala index c65477152..fd0b77674 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD10439Test.scala @@ -18,7 +18,7 @@ import com.rawlabs.snapi.frontend.inferrer.api._ import com.rawlabs.snapi.frontend.inferrer.local.jdbc.JdbcInferrer import com.rawlabs.utils.sources.jdbc.mysql.{MySqlClient, MySqlTableLocation} -class RD10439 extends RawTestSuite with SettingsTestContext with StrictLogging { +class RD10439Test extends RawTestSuite with SettingsTestContext with StrictLogging { val mysqlHostname: String = sys.env("RAW_MYSQL_TEST_HOST") val mysqlDb: String = sys.env("RAW_MYSQL_TEST_DB") diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala similarity index 73% rename from snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala index ae66aeeec..990522678 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/RD3852Test.scala @@ -14,15 +14,11 @@ package com.rawlabs.snapi.frontend.inferrer.local import com.rawlabs.utils.core.{RawTestSuite, RawUtils, SettingsTestContext} import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.frontend.inferrer.api.{ - AutoInferrerProperties, - CsvInputFormatDescriptor, - TextInputStreamFormatDescriptor -} +import com.rawlabs.snapi.frontend.inferrer.api.{AutoInferrerInput, CsvFormatDescriptor, TextInputStreamInferrerOutput} import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import com.rawlabs.utils.sources.filesystem.local.LocalPath -class RD3852 extends RawTestSuite with SettingsTestContext with StrictLogging with LocalLocationsTestContext { +class RD3852Test extends RawTestSuite with SettingsTestContext with StrictLogging with LocalLocationsTestContext { // CSV is the last in the list in the auto inferrer. // So inferring this a csv file means that the other inferrers threw correctly @@ -33,8 +29,8 @@ class RD3852 extends RawTestSuite with SettingsTestContext with StrictLogging wi val l1 = new LocalPath(p) try { - val TextInputStreamFormatDescriptor(_, _, format) = inferrer.infer(AutoInferrerProperties(l1, None)) - assert(format.isInstanceOf[CsvInputFormatDescriptor]) + val TextInputStreamInferrerOutput(_, _, format) = inferrer.infer(AutoInferrerInput(l1, None)) + assert(format.isInstanceOf[CsvFormatDescriptor]) } finally { RawUtils.withSuppressNonFatalException(inferrer.stop()) diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala index ef7fd6dc1..627276399 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/inferrer/local/TextTypeInferrerTest.scala @@ -21,7 +21,7 @@ class TextTypeInferrerTest extends AnyFunSuite with StrictLogging with TextTypeI val nulls = Seq("null") def assertType(values: Seq[String], expected: SourceType) = { val inferred = values.foldLeft(SourceNothingType(): SourceType) { - case (acc: SourceNullableType, value) if nulls.contains(value) => SourceNullableType.cloneAsNullable(acc) + case (acc: SourceNullableType, value) if nulls.contains(value) => SourceNullableType.setNullableShallowClone(acc) case (_: SourceNothingType, value) if nulls.contains(value) => SourceNullType() case (acc, value) => getType(value, acc) } diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LSPTests.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala similarity index 98% rename from snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LSPTests.scala rename to snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala index 3c96b3fd9..80a894fb5 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LSPTests.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source.{ErrorType, IdnDef, IdnExp, IdnUse} +import com.rawlabs.snapi.frontend.rql2.source.{ErrorType, IdnDef, IdnExp, IdnUse} import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.utils.core.RawTestSuite -class Antlr4LSPTests extends RawTestSuite { +class Antlr4LspTests extends RawTestSuite { val triple = "\"\"\"" private def parseWithAntlr4(s: String) = { diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala index 4adaeacfa..6da83386d 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala @@ -12,7 +12,7 @@ package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source.{Exp, SourceNode} +import com.rawlabs.snapi.frontend.rql2.source.{Exp, SourceNode} import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer import com.rawlabs.snapi.frontend.rql2.source.TypeExp import com.rawlabs.utils.core.RawTestSuite diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala index e05327359..3db22b555 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala @@ -13,7 +13,7 @@ package com.rawlabs.snapi.frontend.rql2 import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} -import com.rawlabs.snapi.frontend.common.source.{IdnDef, IdnExp, IdnUse} +import com.rawlabs.snapi.frontend.rql2.source.{IdnDef, IdnExp, IdnUse} import com.rawlabs.snapi.frontend.rql2.source._ import com.rawlabs.utils.core.RawTestSuite diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala index fb6da27b0..fb2a9808e 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala @@ -12,7 +12,7 @@ package com.rawlabs.snapi.frontend.rql2 -import com.rawlabs.snapi.frontend.common.source.{Exp, SourceNode} +import com.rawlabs.snapi.frontend.rql2.source.{Exp, SourceNode} import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer import com.rawlabs.snapi.frontend.rql2.source.TypeExp import com.rawlabs.utils.core.RawTestSuite diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala b/snapi-parser/src/main/java/com/rawlabs/snapi/parser/generated/Placeholder.java similarity index 57% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala rename to snapi-parser/src/main/java/com/rawlabs/snapi/parser/generated/Placeholder.java index c22d93f43..775998c29 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/truffle/Rql2TruffleCompilerTestContext.scala +++ b/snapi-parser/src/main/java/com/rawlabs/snapi/parser/generated/Placeholder.java @@ -1,5 +1,5 @@ /* - * Copyright 2023 RAW Labs S.A. + * Copyright 2024 RAW Labs S.A. * * Use of this software is governed by the Business Source License * included in the file licenses/BSL.txt. @@ -10,8 +10,8 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.compiler.truffle +package com.rawlabs.snapi.parser.generated; -import com.rawlabs.snapi.compiler.tests.Rql2CompilerTestContext - -trait Rql2TruffleCompilerTestContext extends Rql2CompilerTestContext with Rql2TruffleCompilerServiceTestContext +class Placeholder { + // Placeholder class to allow the module-info.java file to be compiled +} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawContext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Context.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawContext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Context.java index bcda485d2..3db908a3a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawContext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Context.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.TruffleLanguage; @@ -21,30 +21,30 @@ import com.rawlabs.compiler.ProgramEnvironment$; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.snapi.frontend.inferrer.api.InferrerService; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.function.RawFunctionRegistry; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.function.FunctionRegistry; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.core.RawUid; import java.io.OutputStream; import java.util.Set; import scala.collection.JavaConverters; -public final class RawContext { +public final class Rql2Context { - private final RawLanguage language; + private final Rql2Language language; private final Env env; private final RawSettings rawSettings; private final OutputStream output; private final ProgramEnvironment programEnvironment; - private final RawFunctionRegistry functionRegistry; + private final FunctionRegistry functionRegistry; @CompilerDirectives.TruffleBoundary - public RawContext(RawLanguage language, Env env) { + public Rql2Context(Rql2Language language, Env env) { this.language = language; this.env = env; this.output = env.out(); - String rawSettingsConfigString = env.getOptions().get(RawOptions.RAW_SETTINGS_KEY); + String rawSettingsConfigString = env.getOptions().get(Rql2Options.RAW_SETTINGS_KEY); // If settings were passed as Engine options, used those as our settings. // Otherwise, default to the settings from the language, which are obtained from the system. if (rawSettingsConfigString.isEmpty()) { @@ -63,14 +63,14 @@ public RawContext(RawLanguage language, Env env) { // The function registry holds snapi methods (top level functions). It is the data // structure that is used to extract a ref to a function from a piece of execute snapi. // Functions appear as polyglot bindings after the execution of the source code. - this.functionRegistry = new RawFunctionRegistry(); + this.functionRegistry = new FunctionRegistry(); } - public RawFunctionRegistry getFunctionRegistry() { + public FunctionRegistry getFunctionRegistry() { return functionRegistry; } - public RawLanguage getLanguage() { + public Rql2Language getLanguage() { return language; } @@ -107,7 +107,7 @@ public boolean existsSecret(String key) { public String getSecret(String key) { scala.Option maybeSecret = programEnvironment.secrets().get(key); if (maybeSecret.isEmpty()) { - throw new RawTruffleRuntimeException("unknown secret: " + key); + throw new TruffleRuntimeException("unknown secret: " + key); } return maybeSecret.get(); } @@ -122,11 +122,11 @@ public LocationConfig getLocationConfig(String name) { scala.Option maybeLocationConfig = programEnvironment.locationConfigs().get(name); if (maybeLocationConfig.isEmpty()) { - throw new RawTruffleRuntimeException("unknown credential: " + name); + throw new TruffleRuntimeException("unknown credential: " + name); } LocationConfig locationConfig = maybeLocationConfig.get(); if (locationConfig.hasError()) { - throw new RawTruffleRuntimeException(locationConfig.getError().getMessage()); + throw new TruffleRuntimeException(locationConfig.getError().getMessage()); } return locationConfig; } @@ -142,10 +142,10 @@ public String[] getScopes() { return javaScopes.toArray(new String[0]); } - private static final TruffleLanguage.ContextReference REFERENCE = - TruffleLanguage.ContextReference.create(RawLanguage.class); + private static final TruffleLanguage.ContextReference REFERENCE = + TruffleLanguage.ContextReference.create(Rql2Language.class); - public static RawContext get(Node node) { + public static Rql2Context get(Node node) { return REFERENCE.get(node); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguage.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Language.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguage.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Language.java index a0d681eb3..725140213 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguage.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Language.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle; import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives; @@ -29,16 +29,20 @@ import com.rawlabs.snapi.frontend.base.InitPhase; import com.rawlabs.snapi.frontend.base.Phase; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.PhaseDescriptor; -import com.rawlabs.snapi.frontend.common.source.SourceProgram; import com.rawlabs.snapi.frontend.inferrer.api.InferrerService; import com.rawlabs.snapi.frontend.rql2.*; +import com.rawlabs.snapi.frontend.rql2.PhaseDescriptor; +import com.rawlabs.snapi.frontend.rql2.phases.ImplicitCastsPhase; +import com.rawlabs.snapi.frontend.rql2.phases.ListProjDesugarerPhase; +import com.rawlabs.snapi.frontend.rql2.phases.PropagationPhase; +import com.rawlabs.snapi.frontend.rql2.phases.SugarExtensionDesugarerPhase; import com.rawlabs.snapi.frontend.rql2.source.InternalSourcePrettyPrinter; import com.rawlabs.snapi.frontend.rql2.source.Rql2Program; -import com.rawlabs.snapi.truffle.emitter.compiler.TruffleEmit; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleValidationException; -import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; +import com.rawlabs.snapi.frontend.rql2.source.SourceProgram; +import com.rawlabs.snapi.truffle.emitter.TruffleEmit; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleValidationException; +import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.record.PureRecord; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.core.RawUid; import com.typesafe.config.ConfigFactory; @@ -48,11 +52,11 @@ import scala.collection.JavaConverters; @TruffleLanguage.Registration( - id = RawLanguage.ID, + id = Rql2Language.ID, name = "RQL", - version = RawLanguage.VERSION, - defaultMimeType = RawLanguage.MIME_TYPE, - characterMimeTypes = RawLanguage.MIME_TYPE) + version = Rql2Language.VERSION, + defaultMimeType = Rql2Language.MIME_TYPE, + characterMimeTypes = Rql2Language.MIME_TYPE) @ProvidedTags({ StandardTags.CallTag.class, StandardTags.StatementTag.class, @@ -62,13 +66,13 @@ StandardTags.ReadVariableTag.class, StandardTags.WriteVariableTag.class }) -public final class RawLanguage extends TruffleLanguage { +public final class Rql2Language extends TruffleLanguage { public static final String ID = "rql"; public static final String VERSION = "0.10"; public static final String MIME_TYPE = "application/x-rql"; - private static final RawLanguageCache languageCache = new RawLanguageCache(); + private static final Rql2LanguageCache languageCache = new Rql2LanguageCache(); private static final RawSettings defaultRawSettings = new RawSettings(ConfigFactory.load(), ConfigFactory.empty()); @@ -88,23 +92,23 @@ public DuplicateKeyRecord createDuplicateKeyRecord() { } @Override - protected final RawContext createContext(Env env) { - RawContext context = new RawContext(this, env); + protected final Rql2Context createContext(Env env) { + Rql2Context context = new Rql2Context(this, env); // The language cache keeps track of active contexts, so that it knows when to shutdown itself. languageCache.incrementContext(context); return context; } @Override - protected void finalizeContext(RawContext context) { + protected void finalizeContext(Rql2Context context) { // The language cache keeps track of active contexts, so that it knows when to shutdown itself. languageCache.releaseContext(context); } - private static final LanguageReference REFERENCE = - LanguageReference.create(RawLanguage.class); + private static final LanguageReference REFERENCE = + LanguageReference.create(Rql2Language.class); - public static RawLanguage get(Node node) { + public static Rql2Language get(Node node) { return REFERENCE.get(node); } @@ -112,15 +116,15 @@ public static RawLanguage get(Node node) { @Override protected OptionDescriptors getOptionDescriptors() { - return RawOptions.OPTION_DESCRIPTORS; + return Rql2Options.OPTION_DESCRIPTORS; } @Override protected CallTarget parse(ParsingRequest request) throws Exception { - RawContext context = RawContext.get(null); + Rql2Context context = Rql2Context.get(null); ProgramContext programContext = - new Rql2ProgramContext( + new ProgramContext( context.getProgramEnvironment(), getCompilerContext(context.getUid(), context.getSettings())); @@ -132,7 +136,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception { if (context .getEnv() .getOptions() - .get(RawOptions.STAGED_COMPILER_KEY) + .get(Rql2Options.STAGED_COMPILER_KEY) .equalsIgnoreCase("true")) { frontend = false; } @@ -166,7 +170,7 @@ protected CallTarget parse(ParsingRequest request) throws Exception { } return rootNode.getCallTarget(); } else { - throw new RawTruffleValidationException(JavaConverters.seqAsJavaList(tree.errors())); + throw new TruffleValidationException(JavaConverters.seqAsJavaList(tree.errors())); } } @@ -175,23 +179,23 @@ protected CallTarget parse(ParsingRequest request) throws Exception { new PhaseDescriptor( "SugarExtensionDesugarer", (Class>) - (Class) SugarExtensionDesugarer.class), + (Class) SugarExtensionDesugarerPhase.class), new PhaseDescriptor( "(Sugar)SugarExtensionDesugarer", (Class>) - (Class) SugarExtensionDesugarer.class), + (Class) SugarExtensionDesugarerPhase.class), new PhaseDescriptor( "ListProjDesugarer", (Class>) - (Class) ListProjDesugarer.class), + (Class) ListProjDesugarerPhase.class), new PhaseDescriptor( "Propagation", (Class>) - (Class) Propagation.class), + (Class) PropagationPhase.class), new PhaseDescriptor( "ImplicitCasts", (Class>) - (Class) ImplicitCasts.class)); + (Class) ImplicitCastsPhase.class)); @CompilerDirectives.TruffleBoundary SourceProgram transpile(SourceProgram root, ProgramContext programContext) { @@ -233,7 +237,7 @@ private Phase buildPipeline( // We return the function registry as a polyglot 'hasMembers' object (members // are the function names, that resolve to the function objects). @Override - protected Object getScope(RawContext context) { + protected Object getScope(Rql2Context context) { return context.getFunctionRegistry().asPolyglot(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguageCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2LanguageCache.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguageCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2LanguageCache.java index 95d618ddc..1764ac576 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawLanguageCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2LanguageCache.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle; import com.oracle.truffle.api.CompilerDirectives; import com.rawlabs.snapi.frontend.base.CompilerContext; @@ -24,12 +24,10 @@ import java.util.concurrent.ConcurrentHashMap; import scala.runtime.BoxedUnit; -public class RawLanguageCache { - - private final ClassLoader classLoader = RawLanguage.class.getClassLoader(); +public class Rql2LanguageCache { private final Object activeContextsLock = new Object(); - private final Set activeContexts = new HashSet(); + private final Set activeContexts = new HashSet(); private final ConcurrentHashMap map = new ConcurrentHashMap<>(); @@ -72,14 +70,14 @@ public InferrerService getInferrer(RawUid user, RawSettings rawSettings) { } @CompilerDirectives.TruffleBoundary - public void incrementContext(RawContext context) { + public void incrementContext(Rql2Context context) { synchronized (activeContextsLock) { activeContexts.add(context); } } @CompilerDirectives.TruffleBoundary - public void releaseContext(RawContext context) { + public void releaseContext(Rql2Context context) { synchronized (activeContextsLock) { activeContexts.remove(context); if (activeContexts.isEmpty()) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawOptions.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Options.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawOptions.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Options.java index 4f3c8494a..ec4b95a6e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawOptions.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Options.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle; import org.graalvm.options.OptionDescriptor; import org.graalvm.options.OptionDescriptors; import org.graalvm.options.OptionKey; -public class RawOptions { +public class Rql2Options { public static final String STAGED_COMPILER = optionName("staged-compiler"); public static final OptionKey STAGED_COMPILER_KEY = new OptionKey<>(""); @@ -34,6 +34,6 @@ public class RawOptions { java.util.Arrays.asList(STAGED_COMPILER_DESCRIPTOR, RAW_SETTINGS_DESCRIPTOR)); private static String optionName(String name) { - return RawLanguage.ID + "." + name; + return Rql2Language.ID + "." + name; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawTypes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Types.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawTypes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Types.java index ade6ea4de..831a38762 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/RawTypes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Types.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle; import com.oracle.truffle.api.dsl.TypeSystem; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.record.PureRecord; @TypeSystem({ boolean.class, @@ -36,4 +36,4 @@ PureRecord.class, DuplicateKeyRecord.class }) -public abstract class RawTypes {} +public abstract class Rql2Types {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/BinaryNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/BinaryNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/BinaryNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/BinaryNode.java index d1d4c1ace..1e05103f5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/BinaryNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/BinaryNode.java @@ -10,10 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.dsl.NodeChild; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; @NodeChild("leftNode") @NodeChild("rightNode") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ExpressionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java similarity index 68% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ExpressionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java index 50a648874..785dc5487 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ExpressionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.dsl.TypeSystemReference; import com.oracle.truffle.api.frame.VirtualFrame; @@ -19,11 +19,13 @@ import com.oracle.truffle.api.instrumentation.StandardTags; import com.oracle.truffle.api.instrumentation.Tag; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.Rql2Types; +import com.rawlabs.snapi.truffle.Rql2TypesGen; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.record.PureRecord; -@TypeSystemReference(RawTypes.class) +@TypeSystemReference(Rql2Types.class) @GenerateWrapper public abstract class ExpressionNode extends StatementNode { @@ -36,75 +38,75 @@ public void executeVoid(VirtualFrame virtualFrame) { } public boolean executeBoolean(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectBoolean(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectBoolean(executeGeneric(virtualFrame)); } public byte executeByte(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectByte(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectByte(executeGeneric(virtualFrame)); } public short executeShort(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectShort(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectShort(executeGeneric(virtualFrame)); } public int executeInt(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectInteger(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectInteger(executeGeneric(virtualFrame)); } public long executeLong(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectLong(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectLong(executeGeneric(virtualFrame)); } public float executeFloat(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectFloat(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectFloat(executeGeneric(virtualFrame)); } public double executeDouble(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectDouble(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectDouble(executeGeneric(virtualFrame)); } public BinaryObject executeBinary(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectBinaryObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectBinaryObject(executeGeneric(virtualFrame)); } public DecimalObject executeDecimal(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectDecimalObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectDecimalObject(executeGeneric(virtualFrame)); } public DateObject executeDate(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectDateObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectDateObject(executeGeneric(virtualFrame)); } public IntervalObject executeInterval(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectIntervalObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectIntervalObject(executeGeneric(virtualFrame)); } public TimeObject executeTime(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectTimeObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectTimeObject(executeGeneric(virtualFrame)); } public TimestampObject executeTimestamp(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectTimestampObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectTimestampObject(executeGeneric(virtualFrame)); } public String executeString(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectString(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectString(executeGeneric(virtualFrame)); } public LocationObject executeLocation(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectLocationObject(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectLocationObject(executeGeneric(virtualFrame)); } public PureRecord executePureRecord(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectPureRecord(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectPureRecord(executeGeneric(virtualFrame)); } public DuplicateKeyRecord executeDuplicateKey(VirtualFrame virtualFrame) throws UnexpectedResultException { - return RawTypesGen.expectDuplicateKeyRecord(executeGeneric(virtualFrame)); + return Rql2TypesGen.expectDuplicateKeyRecord(executeGeneric(virtualFrame)); } @Override diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramExpressionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramExpressionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java index 866cc5834..cfb8ceddf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramExpressionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.Rql2Language; public final class ProgramExpressionNode extends RootNode { - private static final Source DUMMY_SOURCE = Source.newBuilder(RawLanguage.ID, "", "dummy").build(); + private static final Source DUMMY_SOURCE = + Source.newBuilder(Rql2Language.ID, "", "dummy").build(); @Child private ExpressionNode bodyNode; public ProgramExpressionNode( - RawLanguage language, FrameDescriptor frameDescriptor, ExpressionNode body) { + Rql2Language language, FrameDescriptor frameDescriptor, ExpressionNode body) { super(language, frameDescriptor); this.bodyNode = body; this.bodyNode.addRootTag(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramStatementNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramStatementNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java index a6a18a29c..75383d8d7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/ProgramStatementNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java @@ -10,13 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.RootNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.Rql2Language; public final class ProgramStatementNode extends RootNode { @@ -26,7 +25,7 @@ public final class ProgramStatementNode extends RootNode { @Child protected StatementNode bodyNode; public ProgramStatementNode( - RawLanguage language, FrameDescriptor frameDescriptor, StatementNode body) { + Rql2Language language, FrameDescriptor frameDescriptor, StatementNode body) { super(language, frameDescriptor); this.bodyNode = body; this.bodyNode.addRootTag(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/PropertyType.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/PropertyType.java similarity index 96% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/PropertyType.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/PropertyType.java index 0a7f517f0..a0d33948e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/PropertyType.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/PropertyType.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle.ast; // Static properties for dynamic object storage types public class PropertyType { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/StatementNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/StatementNode.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/StatementNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/StatementNode.java index 3688006e9..034d54117 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/StatementNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/StatementNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.instrumentation.*; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/boundary/RawTruffleBoundaries.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TruffleBoundaries.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/boundary/RawTruffleBoundaries.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TruffleBoundaries.java index 3d2ce8176..362cbb558 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/boundary/RawTruffleBoundaries.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TruffleBoundaries.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.boundary; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.CompilerDirectives; import java.util.BitSet; -public class RawTruffleBoundaries { +public class TruffleBoundaries { @CompilerDirectives.TruffleBoundary public static int parseInt(String str) { return Integer.parseInt(str); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/TypeGuards.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java similarity index 99% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/TypeGuards.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java index 43a5a52f4..2ec69e86b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/TypeGuards.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast; +package com.rawlabs.snapi.truffle.ast; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Idempotent; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/ExpBlockNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/controlflow/ExpBlockNode.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/ExpBlockNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/controlflow/ExpBlockNode.java index 03669c0c3..e6ff0708a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/ExpBlockNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/controlflow/ExpBlockNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.controlflow; +package com.rawlabs.snapi.truffle.ast.controlflow; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.BlockNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; public final class ExpBlockNode extends ExpressionNode implements BlockNode.ElementExecutor { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/IfThenElseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/controlflow/IfThenElseNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/IfThenElseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/controlflow/IfThenElseNode.java index 4bb16f4ec..c39e4da28 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/controlflow/IfThenElseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/controlflow/IfThenElseNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.controlflow; +package com.rawlabs.snapi.truffle.ast.controlflow; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.profiles.CountingConditionProfile; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; public final class IfThenElseNode extends ExpressionNode { @@ -62,7 +62,7 @@ private boolean evaluateCondition(VirtualFrame frame) { * The condition evaluated to a non-boolean result. This is a type error in the SL * program. */ - throw new RawTruffleRuntimeException(ex, this); + throw new TruffleRuntimeException(ex, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateMultipleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregateMultipleNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateMultipleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregateMultipleNode.java index 283a466a8..0fee6c698 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateMultipleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregateMultipleNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.ast.expressions.aggregation; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRMultiAggregationBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRMultiAggregationBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; public class AggregateMultipleNode extends ExpressionNode { @@ -84,7 +84,7 @@ public Object executeGeneric(VirtualFrame virtualFrame) { virtualFrame.setObject(resultSlot, results); loop.execute(virtualFrame); return virtualFrame.getObject(resultSlot); - } catch (RawTruffleRuntimeException e) { + } catch (TruffleRuntimeException e) { return new ErrorObject(e.getMessage()); } finally { closeNode.execute(this, generator); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateSingleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregateSingleNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateSingleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregateSingleNode.java index 837264c55..c11bae464 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregateSingleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregateSingleNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.ast.expressions.aggregation; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRSingleAggregationBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRSingleAggregationBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; public class AggregateSingleNode extends ExpressionNode { @@ -82,7 +82,7 @@ public Object executeGeneric(VirtualFrame virtualFrame) { virtualFrame.setObject(resultSlot, result); loop.execute(virtualFrame); return virtualFrame.getObject(resultSlot); - } catch (RawTruffleRuntimeException e) { + } catch (TruffleRuntimeException e) { return new ErrorObject(e.getMessage()); } finally { closeNode.execute(this, generator); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/Aggregations.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/Aggregations.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/Aggregations.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/Aggregations.java index e7ff032e8..a3e7eb893 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/Aggregations.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/Aggregations.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.ast.expressions.aggregation; public class Aggregations { public static final byte COUNT = 0; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregatorNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregatorNodes.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregatorNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregatorNodes.java index efaab9d67..de43e041f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/aggregation/AggregatorNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/aggregation/AggregatorNodes.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; +package com.rawlabs.snapi.truffle.ast.expressions.aggregation; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public class AggregatorNodes { @NodeInfo(shortName = "Aggregator.Zero") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/AndNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/AndNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/AndNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/AndNode.java index 28238c529..e54c07d47 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/AndNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/AndNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public final class AndNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/DivNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/DivNode.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/DivNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/DivNode.java index 3ed9815d4..14db0c8fa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/DivNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/DivNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; @@ -18,9 +18,9 @@ import java.math.BigDecimal; import java.math.MathContext; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; // TODO: further optimization could be done by creating permutations of types? // if we divide 500.0 by 500.0 the result could fit into int, should we specialize that case? diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/EqNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/EqNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/EqNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/EqNode.java index 786380128..16276e23f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/EqNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/EqNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = "==") public class EqNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/GeNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/GeNode.java index ec6de24c0..bd35b844b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/GeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; public class GeNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GtNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/GtNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GtNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/GtNode.java index c8f7d49c0..09691a3d8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/GtNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/GtNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = ">") public class GtNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/LeNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/LeNode.java index 0808287a8..263652c34 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/LeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; public class LeNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LtNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/LtNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LtNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/LtNode.java index e96fe7fef..2f00f8e9f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/LtNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/LtNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = "<") public class LtNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/ModNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/ModNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/ModNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/ModNode.java index 8de2fee0e..d015aa89a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/ModNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/ModNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "%") public abstract class ModNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/MultNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/MultNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/MultNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/MultNode.java index 181e248e7..da8d66345 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/MultNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/MultNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "*") public abstract class MultNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/OrNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/OrNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/OrNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/OrNode.java index 42f8af319..809ebe1d9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/OrNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/OrNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public final class OrNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/PlusNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/PlusNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/PlusNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/PlusNode.java index f8ef33185..8ee32789d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/PlusNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/PlusNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; @NodeInfo(shortName = "+") public class PlusNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/SubNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/SubNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/SubNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/SubNode.java index 5034a58d0..fc9f5161b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/binary/SubNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/binary/SubNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; +package com.rawlabs.snapi.truffle.ast.expressions.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ast.BinaryNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.BinaryNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "-") public abstract class SubNode extends BinaryNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java index c30509618..c7c999b15 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.aws_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.aws_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; import java.net.HttpURLConnection; @@ -69,7 +69,7 @@ private byte[] hmacSHA256(String data, byte[] key) { mac.init(new SecretKeySpec(key, algorithm)); return mac.doFinal(data.getBytes(StandardCharsets.UTF_8)); } catch (NoSuchAlgorithmException | InvalidKeyException e) { - throw new RawTruffleInternalErrorException(e); + throw new TruffleInternalErrorException(e); } } @@ -110,7 +110,7 @@ private MessageDigest getSha256Digest() { try { return MessageDigest.getInstance("SHA-256"); } catch (NoSuchAlgorithmException e) { - throw new RawTruffleInternalErrorException(e); + throw new TruffleInternalErrorException(e); } } @@ -197,16 +197,16 @@ protected LocationObject doRequest( allHeaders[i] = getNode.execute(this, headers, i); } - allHeaders[headersSize] = RawLanguage.get(this).createPureRecord(); + allHeaders[headersSize] = Rql2Language.get(this).createPureRecord(); addPropNode.execute(this, allHeaders[headersSize], "_1", "host", false); addPropNode.execute(this, allHeaders[headersSize], "_2", host, false); - allHeaders[headersSize + 1] = RawLanguage.get(this).createPureRecord(); + allHeaders[headersSize + 1] = Rql2Language.get(this).createPureRecord(); addPropNode.execute(this, allHeaders[headersSize + 1], "_1", "x-amz-date", false); addPropNode.execute(this, allHeaders[headersSize + 1], "_2", amzdate, false); if (!sessionToken.isEmpty()) { - allHeaders[headersSize + 2] = RawLanguage.get(this).createPureRecord(); + allHeaders[headersSize + 2] = Rql2Language.get(this).createPureRecord(); addPropNode.execute(this, allHeaders[headersSize + 2], "_1", "x-amz-security-token", false); addPropNode.execute(this, allHeaders[headersSize + 2], "_2", sessionToken, false); } @@ -325,7 +325,7 @@ protected LocationObject doRequest( HttpURLConnection.HTTP_PARTIAL }; - RawSettings rawSettings = RawContext.get(this).getSettings(); + RawSettings rawSettings = Rql2Context.get(this).getSettings(); HttpByteStreamLocation location = new HttpByteStreamLocation( diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryBase64Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryBase64Node.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryBase64Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryBase64Node.java index 75f2b28dd..9e5b38bc6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryBase64Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryBase64Node.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; import java.util.Base64; @NodeInfo(shortName = "Binary.Base64") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryFromStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryFromStringNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryFromStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryFromStringNode.java index 329248683..bf4562e8a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryFromStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryFromStringNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "Binary.FromString") @NodeChild(value = "binary") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryReadNode.java similarity index 67% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryReadNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryReadNode.java index 290e9108b..68df2b31d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/binary_package/BinaryReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/binary_package/BinaryReadNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; import java.io.IOException; import java.io.InputStream; @@ -38,7 +38,7 @@ protected Object doExecute(LocationObject locationObject) { try { stream = (new TruffleInputStream(locationObject)).getInputStream(); return new BinaryObject(stream.readAllBytes()); - } catch (IOException | RawTruffleRuntimeException ex) { + } catch (IOException | TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } finally { IOUtils.closeQuietly(stream); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java index 4cb5f5ea2..4e8da4540 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; @@ -22,11 +22,11 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.primitives.*; @ImportStatic(value = {TypeGuards.class, StaticInitializers.class}) @NodeInfo(shortName = "Environment.Parameter") @@ -41,7 +41,7 @@ public abstract class EnvironmentParameterNode extends ExpressionNode { protected byte getByte( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -56,7 +56,7 @@ protected byte getByte( protected short getShort( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -71,7 +71,7 @@ protected short getShort( protected int getInt( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -86,7 +86,7 @@ protected int getInt( protected long getLong( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -101,7 +101,7 @@ protected long getLong( protected float getFloat( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -116,7 +116,7 @@ protected float getFloat( protected Double getDouble( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -131,7 +131,7 @@ protected Double getDouble( protected DecimalObject getDecimal( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -146,7 +146,7 @@ protected DecimalObject getDecimal( protected boolean getBool( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -161,7 +161,7 @@ protected boolean getBool( protected String getString( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -176,7 +176,7 @@ protected String getString( protected DateObject getDate( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -191,7 +191,7 @@ protected DateObject getDate( protected TimeObject getTime( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -206,7 +206,7 @@ protected TimeObject getTime( protected TimestampObject getTimestamp( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -222,7 +222,7 @@ protected TimestampObject getTimestamp( protected IntervalObject getInterval( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context, + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java index 5f41ee3f6..9a28a26e2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentScopesNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Bind; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; @NodeInfo(shortName = "Environment.Scopes") @ImportStatic(StaticInitializers.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java similarity index 60% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java index 753396b53..f3a806604 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Environment.Secret") @NodeChild(value = "key") @@ -30,10 +30,10 @@ public abstract class EnvironmentSecretNode extends ExpressionNode { protected static Object doSecret( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRawContext(thisNode)", neverDefault = true) RawContext context) { + @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context) { try { return context.getSecret(key); - } catch (RawTruffleRuntimeException e) { + } catch (TruffleRuntimeException e) { return new ErrorObject(e.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java index b72d76660..5865c5a4d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/function_package/FunctionInvokeAfterNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.function_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.function_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; @NodeInfo(shortName = "Function.InvokeAfter") @NodeChild(value = "function") @@ -36,7 +36,7 @@ protected Object invokeAfter( Thread.sleep(sleepTime); return functionExecuteZero.execute(this, function); } catch (InterruptedException e) { - throw new RawTruffleInternalErrorException(e); + throw new TruffleInternalErrorException(e); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpReadNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java index 67e9f41b2..8b73140f9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.utils.sources.api.LocationException; import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; import com.rawlabs.utils.sources.bytestream.http.HttpResult; @@ -54,7 +54,7 @@ protected static Object doRead( try { HttpByteStreamLocation location = locationObject.getHttpByteStreamLocation(); HttpResult result = location.getHttpResult(); - Object record = RawLanguage.get(thisNode).createPureRecord(); + Object record = Rql2Language.get(thisNode).createPureRecord(); if (!isNullNode.execute(thisNode, statusListOption)) { int[] statuses = new int[(int) sizeNode.execute(thisNode, statusListOption)]; @@ -83,7 +83,7 @@ protected static Object doRead( Object[] headers = new Object[result.headers().size()]; for (int i = 0; i < result.headers().size(); i++) { - headers[i] = RawLanguage.get(thisNode).createPureRecord(); + headers[i] = Rql2Language.get(thisNode).createPureRecord(); addPropNode.execute(thisNode, headers[i], "_1", headerTuples.apply(i)._1(), false); addPropNode.execute(thisNode, headers[i], "_2", headerTuples.apply(i)._2(), false); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java index 4f6f23a87..5f49a9c7a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpUrlDecodeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java index 7623d02b6..d23f53356 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpUrlEncodeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/jdbc/JdbcQueryNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/jdbc/JdbcQueryNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java index dc96e6ee9..2b82c3426 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/jdbc/JdbcQueryNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.jdbc; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.jdbc; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.JdbcQueryCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.JdbcQueryCollection; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; @NodeInfo(shortName = "Jdbc.Query") @@ -44,7 +44,7 @@ public JdbcQueryNode( @Override public Object executeGeneric(VirtualFrame virtualFrame) { - RawSettings rawSettings = RawContext.get(this).getSettings(); + RawSettings rawSettings = Rql2Context.get(this).getSettings(); LocationObject dbLocation = (LocationObject) locationExp.executeGeneric(virtualFrame); String query = (String) this.queryExp.executeGeneric(virtualFrame); return new JdbcQueryCollection( diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationDescribeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationDescribeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java index 68d6ca9f8..287011905 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationDescribeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationDescribeNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; @@ -20,14 +20,14 @@ import com.rawlabs.snapi.frontend.inferrer.api.*; import com.rawlabs.snapi.frontend.rql2.Rql2TypeUtils$; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.utils.core.RawException; import java.util.ArrayList; import java.util.HashMap; @@ -48,12 +48,12 @@ protected Object doDescribe( LocationObject locationObject, int sampleSize, @Cached(inline = true) RecordNodes.AddPropNode addPropNode) { - InferrerService inferrer = RawContext.get(this).getInferrer(); + InferrerService inferrer = Rql2Context.get(this).getInferrer(); try { // In scala implementation interpreter there is a sample size argument - InputFormatDescriptor descriptor = + InferrerOutput descriptor = inferrer.infer( - AutoInferrerProperties.apply( + AutoInferrerInput.apply( locationObject.getLocation(), sampleSize == Integer.MAX_VALUE ? Some.empty() : Some.apply(sampleSize))); @@ -63,27 +63,25 @@ protected Object doDescribe( Map properties = new HashMap<>(); boolean sampled = false; - if (descriptor instanceof SqlTableInputFormatDescriptor) { - SqlTableInputFormatDescriptor sqlTableDescriptor = - (SqlTableInputFormatDescriptor) descriptor; + if (descriptor instanceof SqlTableInferrerOutput) { + SqlTableInferrerOutput sqlTableDescriptor = (SqlTableInferrerOutput) descriptor; format = "relational table"; tipe = sqlTableDescriptor.tipe(); - } else if (descriptor instanceof SqlQueryInputFormatDescriptor) { - SqlQueryInputFormatDescriptor sqlQueryDescriptor = - (SqlQueryInputFormatDescriptor) descriptor; + } else if (descriptor instanceof SqlQueryInferrerOutput) { + SqlQueryInferrerOutput sqlQueryDescriptor = (SqlQueryInferrerOutput) descriptor; format = "relational query"; tipe = sqlQueryDescriptor.tipe(); - } else if (descriptor instanceof TextInputStreamFormatDescriptor) { - TextInputStreamFormatDescriptor textInputQueryDescriptor = - (TextInputStreamFormatDescriptor) descriptor; + } else if (descriptor instanceof TextInputStreamInferrerOutput) { + TextInputStreamInferrerOutput textInputQueryDescriptor = + (TextInputStreamInferrerOutput) descriptor; comment = String.format( "encoding %s (confidence: %s", textInputQueryDescriptor.encoding(), textInputQueryDescriptor.confidence()) + "%)"; - if (textInputQueryDescriptor.format() instanceof CsvInputFormatDescriptor) { - CsvInputFormatDescriptor csvDescriptor = - (CsvInputFormatDescriptor) textInputQueryDescriptor.format(); + if (textInputQueryDescriptor.format() instanceof CsvFormatDescriptor) { + CsvFormatDescriptor csvDescriptor = + (CsvFormatDescriptor) textInputQueryDescriptor.format(); properties.put("has_header", String.valueOf(csvDescriptor.hasHeader())); properties.put("delimiter", String.valueOf(csvDescriptor.delimiter())); ArrayList nls = new ArrayList<>(); @@ -108,27 +106,27 @@ protected Object doDescribe( format = "csv"; tipe = csvDescriptor.tipe(); sampled = csvDescriptor.sampled(); - } else if (textInputQueryDescriptor.format() instanceof JsonInputFormatDescriptor) { - JsonInputFormatDescriptor jsonDescriptor = - (JsonInputFormatDescriptor) textInputQueryDescriptor.format(); + } else if (textInputQueryDescriptor.format() instanceof JsonFormatDescriptor) { + JsonFormatDescriptor jsonDescriptor = + (JsonFormatDescriptor) textInputQueryDescriptor.format(); format = "json"; tipe = jsonDescriptor.tipe(); sampled = jsonDescriptor.sampled(); - } else if (textInputQueryDescriptor.format() instanceof HjsonInputFormatDescriptor) { - HjsonInputFormatDescriptor hjsonDescriptor = - (HjsonInputFormatDescriptor) textInputQueryDescriptor.format(); + } else if (textInputQueryDescriptor.format() instanceof HjsonFormatDescriptor) { + HjsonFormatDescriptor hjsonDescriptor = + (HjsonFormatDescriptor) textInputQueryDescriptor.format(); format = "hjson"; tipe = hjsonDescriptor.tipe(); sampled = hjsonDescriptor.sampled(); - } else if (textInputQueryDescriptor.format() instanceof XmlInputFormatDescriptor) { - XmlInputFormatDescriptor xmlDescriptor = - (XmlInputFormatDescriptor) textInputQueryDescriptor.format(); + } else if (textInputQueryDescriptor.format() instanceof XmlFormatDescriptor) { + XmlFormatDescriptor xmlDescriptor = + (XmlFormatDescriptor) textInputQueryDescriptor.format(); format = "xml"; tipe = xmlDescriptor.tipe(); sampled = xmlDescriptor.sampled(); - } else if (textInputQueryDescriptor.format() instanceof LinesInputFormatDescriptor) { - LinesInputFormatDescriptor linesDescriptor = - (LinesInputFormatDescriptor) textInputQueryDescriptor.format(); + } else if (textInputQueryDescriptor.format() instanceof LinesFormatDescriptor) { + LinesFormatDescriptor linesDescriptor = + (LinesFormatDescriptor) textInputQueryDescriptor.format(); format = "lines"; tipe = linesDescriptor.tipe(); sampled = linesDescriptor.sampled(); @@ -155,7 +153,7 @@ protected Object doDescribe( String formattedType = SourcePrettyPrinter$.MODULE$.format(rql2Type); - Object record = RawLanguage.get(this).createPureRecord(); + Object record = Rql2Language.get(this).createPureRecord(); addPropNode.execute(this, record, "format", format, false); addPropNode.execute(this, record, "comment", comment, false); @@ -165,7 +163,7 @@ protected Object doDescribe( // properties List keyList = new ArrayList<>(properties.keySet()); for (int i = 0; i < keyList.size(); i++) { - Object rec = RawLanguage.get(this).createPureRecord(); + Object rec = Rql2Language.get(this).createPureRecord(); addPropNode.execute(this, rec, "name", keyList.get(i), false); if (properties.containsKey(keyList.get(i))) { addPropNode.execute(this, rec, "value", properties.get(keyList.get(i)), false); @@ -190,7 +188,7 @@ protected Object doDescribe( (Rql2TypeWithProperties) rql2RecordType.atts().apply(i).tipe(); typeStr = SourcePrettyPrinter$.MODULE$.format(fieldType); isNullable = fieldType.props().contains(Rql2IsNullableTypeProperty.apply()); - Object column = RawLanguage.get(this).createPureRecord(); + Object column = Rql2Language.get(this).createPureRecord(); addPropNode.execute( this, column, "col_name", rql2RecordType.atts().apply(i).idn(), false); @@ -212,7 +210,7 @@ protected Object doDescribe( } else { typeStr = SourcePrettyPrinter$.MODULE$.format(flatten); } - Object column = RawLanguage.get(this).createPureRecord(); + Object column = Rql2Language.get(this).createPureRecord(); addPropNode.execute(this, column, "col_name", NullObject.INSTANCE, false); addPropNode.execute(this, column, "col_type", typeStr, false); addPropNode.execute(this, column, "nullable", isNullable, false); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromHttpNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromHttpNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java index 8306401ce..2ac1582f6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromHttpNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.InteropLibrary; @@ -20,12 +20,12 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.HttpHeadersConfig; import com.rawlabs.protocol.compiler.LocationConfig; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; import java.net.HttpURLConnection; @@ -164,7 +164,7 @@ public Object executeGeneric(VirtualFrame frame) { .encodeToString((username + ":" + password).getBytes()))); } - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); // Append any additional headers related to the authentication (if credential name is defined) if (this.authCredentialName != null) { @@ -179,7 +179,7 @@ public Object executeGeneric(VirtualFrame frame) { headersBuilder.$plus$eq(Tuple2.apply(entry.getKey(), entry.getValue())); } } else { - throw new RawTruffleInternalErrorException("credential is not an HTTP headers"); + throw new TruffleInternalErrorException("credential is not an HTTP headers"); } } @@ -215,7 +215,7 @@ public Object executeGeneric(VirtualFrame frame) { } catch (UnsupportedMessageException | InvalidArrayIndexException | UnknownIdentifierException e) { - throw new RawTruffleInternalErrorException(e, this); + throw new TruffleInternalErrorException(e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java index 5a6e66425..6ee8c1e5c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.MySqlConfig; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.mysql.MySqlServerLocation; @@ -36,7 +36,7 @@ public LocationFromMySQLCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); @@ -57,7 +57,7 @@ public JdbcServerLocation getJdbcServerLocation(LocationConfig l, RawSettings ra mysql.getPassword(), rawSettings); } else { - throw new RawTruffleRuntimeException("credential is not a MySQL server"); + throw new TruffleRuntimeException("credential is not a MySQL server"); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java index e3a84ffe0..0f89f0d8b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromMySQLNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.mysql.MySqlServerLocation; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, RawContext.get(this).getSettings()); + host, port, db, username, password, Rql2Context.get(this).getSettings()); return new LocationObject(location, "mysql:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java index f3b6e2911..6767fa483 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.OracleConfig; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.oracle.OracleServerLocation; @@ -36,7 +36,7 @@ public LocationFromOracleCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); @@ -57,7 +57,7 @@ public JdbcServerLocation getJdbcServerLocation(LocationConfig l, RawSettings ra oracle.getPassword(), rawSettings); } else { - throw new RawTruffleRuntimeException("credential is not an Oracle server"); + throw new TruffleRuntimeException("credential is not an Oracle server"); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java index 938c8619e..4d95dd313 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromOracleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.oracle.OracleServerLocation; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, RawContext.get(this).getSettings()); + host, port, db, username, password, Rql2Context.get(this).getSettings()); return new LocationObject(location, "oracle:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java index ce9a1f182..6f6d48602 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.PostgreSQLConfig; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.pgsql.PostgresqlServerLocation; @@ -36,7 +36,7 @@ public LocationFromPostgreSQLCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); @@ -57,7 +57,7 @@ public JdbcServerLocation getJdbcServerLocation(LocationConfig l, RawSettings ra postgresql.getPassword(), rawSettings); } else { - throw new RawTruffleRuntimeException("credential is not a PostgreSQL server"); + throw new TruffleRuntimeException("credential is not a PostgreSQL server"); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java index b79f02a22..8994a1380 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.pgsql.PostgresqlServerLocation; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, RawContext.get(this).getSettings()); + host, port, db, username, password, Rql2Context.get(this).getSettings()); return new LocationObject(location, "pgsql:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromS3Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromS3Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java index 09c2e0e5d..d8db84cf3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromS3Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.S3Config; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.sources.filesystem.s3.S3Path; import scala.None$; import scala.Option; @@ -50,7 +50,7 @@ public Object executeGeneric(VirtualFrame frame) { // Parse S3 URL to obtain S3 bucket and path if (!url.startsWith("s3://")) { - throw new RawTruffleRuntimeException("invalid S3 URL format: " + url); + throw new TruffleRuntimeException("invalid S3 URL format: " + url); } // Remove the "s3://" prefix @@ -69,7 +69,7 @@ public Object executeGeneric(VirtualFrame frame) { // "If the S3 bucket is not registered in the credentials storage, then the region, accessKey // and secretKey must be provided as arguments." // However, if the access key/secret key are passed, they should be used. - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); S3Path location; if (this.accessKey == null && this.secretKey == null diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java index 42d433b65..d996544c8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.SQLServerConfig; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.sqlserver.SqlServerServerLocation; @@ -36,7 +36,7 @@ public LocationFromSQLServerCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); @@ -57,7 +57,7 @@ public JdbcServerLocation getJdbcServerLocation(LocationConfig l, RawSettings ra sqlserver.getPassword(), rawSettings); } else { - throw new RawTruffleRuntimeException("credential is not a SQL Server server"); + throw new TruffleRuntimeException("credential is not a SQL Server server"); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java index f338fc7aa..bc62c22a1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.sqlserver.SqlServerServerLocation; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, RawContext.get(this).getSettings()); + host, port, db, username, password, Rql2Context.get(this).getSettings()); return new LocationObject(location, "sqlserver:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java index f1335e384..42bfe0a98 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.SnowflakeConfig; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.snowflake.SnowflakeServerLocation; @@ -36,7 +36,7 @@ public LocationFromSnowflakeCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); @@ -57,7 +57,7 @@ public JdbcServerLocation getJdbcServerLocation(LocationConfig l, RawSettings ra snowflake.getParameters(), rawSettings); } else { - throw new RawTruffleRuntimeException("credential is not a Snowflake server"); + throw new TruffleRuntimeException("credential is not a Snowflake server"); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java index 010c8ee86..17b14089e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; @@ -19,12 +19,12 @@ import com.oracle.truffle.api.interop.UnknownIdentifierException; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.jdbc.api.JdbcServerLocation; import com.rawlabs.utils.sources.jdbc.snowflake.SnowflakeServerLocation; @@ -84,13 +84,13 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - db, username, password, accountID, parameters, RawContext.get(this).getSettings()); + db, username, password, accountID, parameters, Rql2Context.get(this).getSettings()); return new LocationObject(location, "snowflake:" + db); } catch (UnsupportedMessageException | InvalidArrayIndexException | UnknownIdentifierException e) { - throw new RawTruffleInternalErrorException(e, this); + throw new TruffleInternalErrorException(e, this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java similarity index 68% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java index 280aed95f..6b0f0c69f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationFromStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.sources.api.Location; import scala.util.Either; @@ -36,19 +36,19 @@ public LocationFromStringNode(ExpressionNode url) { public Object executeGeneric(VirtualFrame frame) { String url = (String) this.url.executeGeneric(frame); - RawContext context = RawContext.get(this); + Rql2Context context = Rql2Context.get(this); Location location = getLocationFromUrl(url, context); return new LocationObject(location, url); } @CompilerDirectives.TruffleBoundary - private Location getLocationFromUrl(String url, RawContext context) { + private Location getLocationFromUrl(String url, Rql2Context context) { Either maybeLocation = LocationDescription$.MODULE$.urlToLocation( url, context.getProgramEnvironment(), context.getSettings()); if (maybeLocation.isLeft()) { - throw new RawTruffleRuntimeException(maybeLocation.left().get()); + throw new TruffleRuntimeException(maybeLocation.left().get()); } return maybeLocation.right().get(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java index 16a16be4f..5566a3d0b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.utils.core.RawException; import com.rawlabs.utils.sources.filesystem.api.*; import java.time.LocalDateTime; @@ -49,8 +49,8 @@ protected Object doLl( Object[] result = new Object[size]; for (int i = 0; i < size; i++) { - Object topRecord = RawLanguage.get(this).createPureRecord(); - Object metadata = RawLanguage.get(this).createPureRecord(); + Object topRecord = Rql2Language.get(this).createPureRecord(); + Object metadata = Rql2Language.get(this).createPureRecord(); addPropNode.execute( this, topRecord, @@ -95,7 +95,7 @@ protected Object doLl( int blocksSize = fileMetadata.blocks().length; Object[] blocks = new Object[blocksSize]; for (int j = 0; j < blocksSize; j++) { - Object block = RawLanguage.get(this).createPureRecord(); + Object block = Rql2Language.get(this).createPureRecord(); addPropNode.execute( this, block, "hosts", new StringList(fileMetadata.blocks()[j].hosts()), false); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java index e12e9a175..d53abc78d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/location_package/LocationLsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawException; import com.rawlabs.utils.sources.filesystem.api.FileSystemLocation; import scala.collection.IndexedSeq; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAbsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAbsNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAbsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAbsNode.java index 1e5530d9f..ee92b1ddc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAbsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAbsNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; // TODO: A.Z make sure that the semantics are correct @NodeInfo(shortName = "Math.Abs") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAcosNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAcosNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAcosNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAcosNode.java index 7abd5cc05..1031a1eb7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAcosNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAcosNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Acos") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAsinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAsinNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAsinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAsinNode.java index 15cb1e396..9a8d034cd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAsinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAsinNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; // TODO: Check Acos comments @NodeInfo(shortName = "Math.Asin") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtanNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAtanNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtanNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAtanNode.java index 242d513ac..ff257ed87 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtanNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAtanNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Atan") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtn2Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAtn2Node.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtn2Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAtn2Node.java index a1d8a0ebd..40ddfd0a4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathAtn2Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathAtn2Node.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Atn2") @NodeChild(value = "left", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCeilingNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCeilingNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCeilingNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCeilingNode.java index 7516f9bbe..a13a33815 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCeilingNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCeilingNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; import java.math.RoundingMode; @NodeInfo(shortName = "Math.Ceiling") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCosNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCosNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCosNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCosNode.java index 04262683f..1a6ac1db9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCosNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCosNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Cos") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCotNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCotNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCotNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCotNode.java index f5382809c..2eab37b24 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathCotNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathCotNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Cot") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathDegreesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathDegreesNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathDegreesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathDegreesNode.java index ec399a0e3..9203c337d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathDegreesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathDegreesNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Degrees") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathExpNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathExpNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathExpNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathExpNode.java index 095faff92..5db143f99 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathExpNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathExpNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Exp") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathFloorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathFloorNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathFloorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathFloorNode.java index e2db17ee9..b732b1d74 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathFloorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathFloorNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; import java.math.RoundingMode; @NodeInfo(shortName = "Math.Floor") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLog10Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathLog10Node.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLog10Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathLog10Node.java index 1c626749a..cc73333a9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLog10Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathLog10Node.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Log10") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLogNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathLogNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLogNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathLogNode.java index 41957e580..00b9aba0d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathLogNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathLogNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Log") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathPowerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathPowerNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathPowerNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathPowerNode.java index d0f6bdef0..3ef90fb8e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathPowerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathPowerNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Power") @NodeChild(value = "left", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathRadiansNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathRadiansNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathRadiansNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathRadiansNode.java index fec79683a..628ccb443 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathRadiansNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathRadiansNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Radians") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSignNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSignNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSignNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSignNode.java index 508aa7a54..66362ad67 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSignNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSignNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Sign") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSinNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSinNode.java index 107cd2106..5aa44e2d1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSinNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Sin") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSqrtNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSqrtNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSqrtNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSqrtNode.java index d99eb4ae5..da2803ee6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSqrtNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSqrtNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Sqrt") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSquareNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSquareNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSquareNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSquareNode.java index af4b024f0..f6633739d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathSquareNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathSquareNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Floor") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathTanNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathTanNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathTanNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathTanNode.java index 3c56b11d7..b39ff7169 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/math_package/MathTanNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/math_package/MathTanNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Math.Sin") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java index 8149dd9ae..ee7b7e6de 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/byte_package/ByteFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.byte_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.byte_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Byte.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java index bfe804f3f..093f819ea 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.decimal_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import java.math.BigDecimal; @NodeInfo(shortName = "Decimal.From") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java index 62c4a2c34..7058c10bc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/decimal_package/DecimalRoundNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.decimal_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; import java.math.BigDecimal; import java.math.MathContext; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java index a17f9d5e3..87c2bddc8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/double_package/DoubleFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.double_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.double_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Double.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/float_package/FloatFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/float_package/FloatFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/float_package/FloatFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/float_package/FloatFromNode.java index c3e9fcde9..d843d1a84 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/float_package/FloatFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/float_package/FloatFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.float_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Float.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/int_package/IntFromNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/int_package/IntFromNode.java index 2ca3c2b4d..122b5b729 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/int_package/IntFromNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.int_package; -import static com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries.parseInt; +import static com.rawlabs.snapi.truffle.ast.TruffleBoundaries.parseInt; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Int.From") @NodeChild(value = "argument", type = ExpressionNode.class) -@ImportStatic(RawTruffleBoundaries.class) +@ImportStatic(TruffleBoundaries.class) public abstract class IntFromNode extends ExpressionNode { @Specialization diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntRangeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/int_package/IntRangeNode.java similarity index 67% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntRangeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/int_package/IntRangeNode.java index 369506d0f..f0f732252 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/int_package/IntRangeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/int_package/IntRangeNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.int_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.IntRangeCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.IntRangeCollection; @NodeInfo(shortName = "Int.Range") @NodeChild(value = "start") @@ -28,7 +28,7 @@ public abstract class IntRangeNode extends ExpressionNode { @Specialization protected Object doRange(int start, int end, int step) { if (step <= 0) - throw new RawTruffleRuntimeException("range step has to be strictly positive", this); + throw new TruffleRuntimeException("range step has to be strictly positive", this); return new IntRangeCollection(start, end, step); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/long_package/LongFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/long_package/LongFromNode.java index f4fdaf420..80d78d6e4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/long_package/LongFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.long_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Long.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongRangeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/long_package/LongRangeNode.java similarity index 67% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongRangeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/long_package/LongRangeNode.java index 5c4ef03cf..b77ea86ae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/long_package/LongRangeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/long_package/LongRangeNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.long_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.LongRangeCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.LongRangeCollection; @NodeInfo(shortName = "Int.Range") @NodeChild(value = "start") @@ -27,7 +27,7 @@ public abstract class LongRangeNode extends ExpressionNode { @Specialization protected Object doRange(long start, long end, long step) { if (step <= 0) - throw new RawTruffleRuntimeException("range step has to be strictly positive", this); + throw new TruffleRuntimeException("range step has to be strictly positive", this); return new LongRangeCollection(start, end, step); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/short_package/ShortFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/short_package/ShortFromNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/short_package/ShortFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/short_package/ShortFromNode.java index 07140dbbb..4268ea1d4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/numeric/short_package/ShortFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/numeric/short_package/ShortFromNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.short_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.short_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Short.From") @NodeChild(value = "argument", type = ExpressionNode.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexCache.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexCache.java index fe06b0ee4..c5b63d510 100755 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexCache.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import java.util.HashMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java index 9028726cf..18896a96c 100755 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexFirstMatchInNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexGroupsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexGroupsNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexGroupsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexGroupsNode.java index ea59e4a96..746b89d37 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexGroupsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexGroupsNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexMatchesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexMatchesNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexMatchesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexMatchesNode.java index 87332ce86..3cc15ae0e 100755 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexMatchesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexMatchesNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexReplaceNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexReplaceNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexReplaceNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexReplaceNode.java index 7d657daf3..ed1027cf4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/regex_package/RegexReplaceNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/regex_package/RegexReplaceNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringBase64Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringBase64Node.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringBase64Node.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringBase64Node.java index fa4c919b2..02ae79180 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringBase64Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringBase64Node.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.Base64; @NodeInfo(shortName = "String.Base64") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCapitalizeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringCapitalizeNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCapitalizeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringCapitalizeNode.java index d4e3306bc..20d7e516e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCapitalizeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringCapitalizeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Capitalize") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringContainsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringContainsNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringContainsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringContainsNode.java index a298ddab8..f3dc136ef 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringContainsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringContainsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Contains") @NodeChild(value = "s1") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCountSubStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringCountSubStringNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCountSubStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringCountSubStringNode.java index f8b361aab..975c05cf6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringCountSubStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringCountSubStringNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.CountSubString") @NodeChild(value = "string1") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringDecodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringDecodeNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringDecodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringDecodeNode.java index 16e6a9469..6ef59c15e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringDecodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringDecodeNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import com.rawlabs.utils.sources.api.Encoding; import java.nio.charset.Charset; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEmptyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringEmptyNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEmptyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringEmptyNode.java index bcfe9526f..74bda45c7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEmptyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringEmptyNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Empty") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEncodeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringEncodeNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEncodeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringEncodeNode.java index 6e82197d4..ba3e5505e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringEncodeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringEncodeNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import com.rawlabs.utils.sources.api.Encoding; import java.nio.charset.Charset; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringFromNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringFromNode.java index 5af943fea..98e544b11 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringFromNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; -import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.*; +import static com.rawlabs.snapi.truffle.runtime.primitives.TruffleTemporalFormatter.*; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.*; @NodeInfo(shortName = "String.From") @NodeChild(value = "value") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLTrimNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLTrimNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLTrimNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLTrimNode.java index e8ca50f6f..2dad58f0a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLTrimNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLTrimNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.LTrim") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLengthNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLengthNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLengthNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLengthNode.java index df0ec9730..2c975e6dc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLengthNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLengthNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Length") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java index 7e89bae65..5e829fab7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLevenshteinDistanceNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.Arrays; @NodeInfo(shortName = "String.LevenshteinDistance") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLowerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLowerNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLowerNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLowerNode.java index 66fc97553..dabe161b7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringLowerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringLowerNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Lower") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringRTrimNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringRTrimNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringRTrimNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringRTrimNode.java index ea138ff23..8e5ce68d4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringRTrimNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringRTrimNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.RTrim") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadLinesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReadLinesNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadLinesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReadLinesNode.java index 04e000bfb..6b82c4442 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadLinesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReadLinesNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.ReadLinesCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.ReadLinesCollection; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReadNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReadNode.java index 7bf5a5cb4..54bd8262e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReadNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; import java.io.IOException; import java.io.Reader; @@ -43,7 +43,7 @@ protected static Object doExecute(LocationObject locationObject, String encoding } finally { IOUtils.closeQuietly(reader); } - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplaceNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReplaceNode.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplaceNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReplaceNode.java index 64cb0b300..a69ca9333 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplaceNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReplaceNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Replace") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplicateNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReplicateNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplicateNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReplicateNode.java index af6808a99..50d8162e9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReplicateNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReplicateNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Replicate") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReverseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReverseNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReverseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReverseNode.java index 903b876d3..0920af8a0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringReverseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringReverseNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Reverse") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSplitNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringSplitNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSplitNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringSplitNode.java index 7ba9a92cd..5d447759a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSplitNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringSplitNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.regex.Pattern; @NodeInfo(shortName = "String.Split") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringStartsWithNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringStartsWithNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringStartsWithNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringStartsWithNode.java index 954ab6570..8d3115ffe 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringStartsWithNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringStartsWithNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.StartsWith") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSubStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringSubStringNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSubStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringSubStringNode.java index 0883bf7d3..e9929aad3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringSubStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringSubStringNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; @NodeInfo(shortName = "String.SubString") @NodeChild(value = "string") @@ -29,7 +29,7 @@ public abstract class StringSubStringNode extends ExpressionNode { @TruffleBoundary protected String stringSubstring(String string, int begin, int length) { if (begin <= 0) { - throw new RawTruffleRuntimeException("invalid index: indexes start at 1", this); + throw new TruffleRuntimeException("invalid index: indexes start at 1", this); } int end; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringTrimNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringTrimNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringTrimNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringTrimNode.java index 8c2af90c9..af1eeddd6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringTrimNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringTrimNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Trim") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringUpperNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringUpperNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringUpperNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringUpperNode.java index 1d301d660..6e1732db4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/string_package/StringUpperNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/string_package/StringUpperNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "String.Upper") @NodeChild(value = "string") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/DateTimeFormatCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/DateTimeFormatCache.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/DateTimeFormatCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/DateTimeFormatCache.java index eb962d4ca..3ad7fed89 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/DateTimeFormatCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/DateTimeFormatCache.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import java.time.format.DateTimeFormatter; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java index 3665a9724..3a177bb91 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateAddIntervalNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateBuildNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateBuildNode.java index f56246f82..930247b7c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateBuildNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import java.time.DateTimeException; import java.time.LocalDate; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateDayNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateDayNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateDayNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateDayNode.java index 556ef0592..5574a5409 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateDayNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateDayNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Day") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java index ee28f921e..dd3a035b3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateFromEpochDayNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; import java.time.LocalDate; @NodeInfo(shortName = "Date.FromEpochDay") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java index 548f0d4b2..8877439c5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateFromTimestampNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateMonthNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateMonthNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateMonthNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateMonthNode.java index 648b299c4..8999c72df 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateMonthNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateMonthNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Month") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateNowNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateNowNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateNowNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateNowNode.java index ba6ea1078..a8255469b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateNowNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateNowNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; import java.time.LocalDate; @NodeInfo(shortName = "Date.Now") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateParseNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateParseNode.java index 8e09dd91c..c33946ccf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateParseNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java index 99c6eb528..54f1318c8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractIntervalNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java index 1e382b138..a4a8356f9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateSubtractNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; import java.time.LocalDate; @NodeInfo(shortName = "Date.Subtract") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateYearNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateYearNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateYearNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateYearNode.java index 850812dd8..93e6266ad 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/date_package/DateYearNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/date_package/DateYearNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "Date.Year") @NodeChild("date") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java index cc262c9ea..97b11a413 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalBuildNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Build") @NodeChild("y") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java index b373dd542..b3e6da9a5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalDaysNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Days") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java index 6053b169e..6fef7b116 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalFromMillisNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.FromMillis") @NodeChild("millis") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java index c47746e16..cc4b4b1f7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalHoursNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Hours") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java index 423ffcce5..87db84d80 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMillisNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Millis") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java index ada5c3da1..7fff7e65d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMinutesNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Minutes") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java index ba302e4c8..3bdd8acb6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalMonthsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Months") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java index 8cee73c52..6a30ca4e7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalNodes.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.TruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; import java.time.Duration; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -101,22 +101,22 @@ static IntervalObject build(Node node, String interval) { if (matcher.matches()) { String matchYears = matcher.group(1); - years = matchYears == null ? 0 : RawTruffleBoundaries.parseInt(matchYears); + years = matchYears == null ? 0 : TruffleBoundaries.parseInt(matchYears); String matchMonths = matcher.group(2); - months = matchMonths == null ? 0 : RawTruffleBoundaries.parseInt(matchMonths); + months = matchMonths == null ? 0 : TruffleBoundaries.parseInt(matchMonths); String matchWeeks = matcher.group(3); - weeks = matchWeeks == null ? 0 : RawTruffleBoundaries.parseInt(matchWeeks); + weeks = matchWeeks == null ? 0 : TruffleBoundaries.parseInt(matchWeeks); String matchDays = matcher.group(4); - days = matchDays == null ? 0 : RawTruffleBoundaries.parseInt(matchDays); + days = matchDays == null ? 0 : TruffleBoundaries.parseInt(matchDays); String matchHours = matcher.group(5); - hours = matchHours == null ? 0 : RawTruffleBoundaries.parseInt(matchHours); + hours = matchHours == null ? 0 : TruffleBoundaries.parseInt(matchHours); String matchMinutes = matcher.group(6); - minutes = matchMinutes == null ? 0 : RawTruffleBoundaries.parseInt(matchMinutes); + minutes = matchMinutes == null ? 0 : TruffleBoundaries.parseInt(matchMinutes); String s1 = matcher.group(7); String s2 = matcher.group(8); @@ -126,22 +126,22 @@ static IntervalObject build(Node node, String interval) { seconds = 0; millis = 0; } else if (s1 != null) { - seconds = RawTruffleBoundaries.parseInt(s1); + seconds = TruffleBoundaries.parseInt(s1); millis = 0; } else { - millis = RawTruffleBoundaries.parseInt(millisStr); + millis = TruffleBoundaries.parseInt(millisStr); // milliseconds will have the same sign as the seconds if (millisStr.length() < 3) { int multiplier = 1; for (int i = 1; i < (3 - millisStr.length() + 1); i++) { multiplier = multiplier * 10; - millis = RawTruffleBoundaries.parseInt(millisStr) * multiplier; + millis = TruffleBoundaries.parseInt(millisStr) * multiplier; } } else { - millis = RawTruffleBoundaries.parseInt(millisStr.substring(0, 3)); + millis = TruffleBoundaries.parseInt(millisStr.substring(0, 3)); } - seconds = RawTruffleBoundaries.parseInt(s2); + seconds = TruffleBoundaries.parseInt(s2); if (seconds < 0) { millis = -millis; } @@ -149,7 +149,7 @@ static IntervalObject build(Node node, String interval) { return new IntervalObject(years, months, weeks, days, hours, minutes, seconds, millis); } else { - throw new RawTruffleRuntimeException( + throw new TruffleRuntimeException( String.format("could not parse interval from string '%s'", interval)); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java index 258eafb0e..af6155084 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalParseNode.java @@ -10,26 +10,26 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; -import static com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries.parseInt; +import static com.rawlabs.snapi.truffle.ast.TruffleBoundaries.parseInt; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TruffleBoundaries; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; import java.text.ParseException; import java.util.regex.Matcher; import java.util.regex.Pattern; @NodeInfo(shortName = "Interval.Parse") @NodeChild("format") -@ImportStatic(RawTruffleBoundaries.class) +@ImportStatic(TruffleBoundaries.class) public abstract class IntervalParseNode extends ExpressionNode { private int intOrDefault(String toParse) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java index 7f3beef08..370650454 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalSecondsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Seconds") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java index 580241373..ed4d5d27d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalToMillisNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.ToMillis") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java index 0216f740c..32fa6befe 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalWeeksNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Weeks") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java index e7b2ef40d..c05eeb3ad 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/interval_package/IntervalYearsNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "Interval.Years") @NodeChild("interval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java index c5372248b..5abd3751b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeAddIntervalNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.time.LocalTime; @NodeInfo(shortName = "Date.AddInterval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java index 62b2d57ab..c9cb9aead 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeBuildNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.time.DateTimeException; import java.time.LocalTime; import java.util.concurrent.TimeUnit; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeHourNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeHourNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeHourNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeHourNode.java index 3cbd7562c..b8672e5ff 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeHourNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeHourNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Hour") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java index b09c45990..ffc44a76b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeMillisNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.util.concurrent.TimeUnit; @NodeInfo(shortName = "Time.Millis") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java index 8d01da730..3de658e3f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeMinuteNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Minute") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeNowNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeNowNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeNowNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeNowNode.java index 61a046e04..81bfa2eed 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeNowNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeNowNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.time.LocalTime; @NodeInfo(shortName = "Time.Now") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeParseNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeParseNode.java index e8f1f81c5..71bf138a9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeParseNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.time.LocalTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java index d8f4720d5..bd1fa24a1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSecondNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.Second") @NodeChild("time") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java index 2576ac37a..eb4c07aa0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractIntervalNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.time.LocalTime; @NodeInfo(shortName = "Date.AddInterval") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java index ac1890144..6c6614c20 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/time_package/TimeSubtractNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.time.LocalTime; @NodeInfo(shortName = "Time.Subtract") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java index e429d8d89..42df88741 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampAddIntervalNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDateTime; @NodeInfo(shortName = "Timestamp.Subtract") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java index 78172b4a3..24c4e3205 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampBuildNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.DateTimeException; import java.time.LocalDateTime; import java.util.concurrent.TimeUnit; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java index d182f33fd..e7d998533 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampDayNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Day") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java index 11601dbf4..dc2054151 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromDateNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java index 4bc97818a..688e19fb0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampFromUnixTimestampNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java index 6a8c4284e..24ac51c6e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampHourNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Hour") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java index caed46b40..810e2b434 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMillisNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.util.concurrent.TimeUnit; @NodeInfo(shortName = "Timestamp.Millis") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java index f64e4abb6..6f21f0c6d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMinuteNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Minute") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java index 6886781da..c85796864 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampMonthNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Month") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java index e6bf6147f..6aba0afda 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampNowNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDateTime; @NodeInfo(shortName = "Timestamp.Now") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java index c4be33d27..4859ebbfc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampParseNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java similarity index 62% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java index 5a2e65511..28b6c8947 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampRangeNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.TimestampRangeCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.TimestampRangeCollection; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Range") @NodeChild("start") @@ -38,7 +38,7 @@ protected Object doRange( IntervalObject step, @Cached(inline = true) IntervalNodes.IntervalCompareNode compareNode) { if (compareNode.execute(this, step, zero) <= 0) - throw new RawTruffleRuntimeException("range step has to be strictly positive", this); + throw new TruffleRuntimeException("range step has to be strictly positive", this); return new TimestampRangeCollection(start, end, step); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java index a619383d2..689ca00f2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSecondNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Second") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java index 098823a89..06308c5f1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractIntervalNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDateTime; @NodeInfo(shortName = "Timestamp.Subtract") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java index a97889cc4..4084753d5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampSubtractNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDateTime; @NodeInfo(shortName = "Timestamp.Subtract") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java index 107c18ee2..247ebf530 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketIntervalNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -44,7 +44,7 @@ protected TimestampObject fromUnixTimestamp( long millis = toMillisNode.execute(this, intervalObj); if (millis == 0) - throw new RawTruffleRuntimeException("interval cannot be empty in time_bucket", this); + throw new TruffleRuntimeException("interval cannot be empty in time_bucket", this); if (intervalObj.getWeeks() == 0 && intervalObj.getDays() == 0 @@ -71,7 +71,7 @@ protected TimestampObject fromUnixTimestamp( result = LocalDateTime.ofInstant(Instant.ofEpochMilli(truncated), ZoneId.of("UTC")); } else { - throw new RawTruffleRuntimeException( + throw new TruffleRuntimeException( "intervals in time_bucket cannot have years or months mixed with other fields.", this); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java index 76ef75633..ebe3a6cde 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampTimeBucketStringNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.DayOfWeek; import java.time.LocalDateTime; import java.time.temporal.TemporalAdjusters; @@ -121,7 +121,7 @@ protected TimestampObject timestampTimeBucket(String value, TimestampObject time result = LocalDateTime.of(yearMil, 1, 1, 0, 0); break; default: - throw new RawTruffleRuntimeException( + throw new TruffleRuntimeException( "intervals in time_bucket cannot have years or months mixed with other fields.", this); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java index e576342b9..bca9b09ae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampToUnixTimestampNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.ZoneId; @NodeInfo(shortName = "Timestamp.ToUnixTimestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java index cba8dbcb6..b0c746f8c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/temporals/timestamp_package/TimestampYearNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.Year") @NodeChild("timestamp") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeMatchNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeMatchNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeMatchNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeMatchNode.java index df226aa72..48e7b917d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeMatchNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeMatchNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.or.OrObject; public class TypeMatchNode extends ExpressionNode { @Child private ExpressionNode typeExp; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java similarity index 68% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java index e9dac1a0f..2b0a32b64 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeProtectCastOptionNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleUnexpectedNullException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleUnexpectedNullException; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public final class TypeProtectCastOptionNode extends ExpressionNode { @@ -28,7 +28,7 @@ public TypeProtectCastOptionNode(ExpressionNode child) { public Object executeGeneric(VirtualFrame virtualFrame) { try { return child.executeGeneric(virtualFrame); - } catch (RawTruffleUnexpectedNullException e) { + } catch (TruffleUnexpectedNullException e) { return NullObject.INSTANCE; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java similarity index 70% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java index a36534750..ab6478693 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/type_package/TypeProtectCastTryableNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; +package com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; public final class TypeProtectCastTryableNode extends ExpressionNode { @@ -28,7 +28,7 @@ public TypeProtectCastTryableNode(ExpressionNode child) { public Object executeGeneric(VirtualFrame virtualFrame) { try { return child.executeGeneric(virtualFrame); - } catch (RawTruffleRuntimeException e) { + } catch (TruffleRuntimeException e) { return new ErrorObject(e.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/ClosureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/ClosureNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/ClosureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/ClosureNode.java index 4b6908f97..a1463d91d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/ClosureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/ClosureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; +package com.rawlabs.snapi.truffle.ast.expressions.function; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Closure; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.Closure; +import com.rawlabs.snapi.truffle.runtime.function.Function; public class ClosureNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/InvokeNode.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/InvokeNode.java index 2ec5bee03..45502c812 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/InvokeNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; +package com.rawlabs.snapi.truffle.ast.expressions.function; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; @@ -18,7 +18,7 @@ import com.oracle.truffle.api.instrumentation.Tag; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "InvokeWithNames") public final class InvokeNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/InvokeNodes.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/InvokeNodes.java index 3dd77247b..d2d26aef6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/InvokeNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/InvokeNodes.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; +package com.rawlabs.snapi.truffle.ast.expressions.function; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Lambda; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.Lambda; // A proxy node that dispatches to the correct execute method of a function runtime object. public class InvokeNodes { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/MethodNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/MethodNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java index 0fcf07f17..5293e58ae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/MethodNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; +package com.rawlabs.snapi.truffle.ast.expressions.function; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Closure; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Lambda; -import com.rawlabs.snapi.truffle.runtime.runtime.function.RawFunctionRegistry; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.Closure; +import com.rawlabs.snapi.truffle.runtime.function.Function; +import com.rawlabs.snapi.truffle.runtime.function.FunctionRegistry; +import com.rawlabs.snapi.truffle.runtime.function.Lambda; import java.util.Arrays; import java.util.Objects; @@ -35,7 +35,7 @@ public final class MethodNode extends ExpressionNode { private final String name; private final boolean hasFreeVars; private final boolean hasOptionalArgs; - private final RawFunctionRegistry functionRegistry = RawContext.get(this).getFunctionRegistry(); + private final FunctionRegistry functionRegistry = Rql2Context.get(this).getFunctionRegistry(); public MethodNode( String name, Function f, ExpressionNode[] defaultArgumentExps, boolean hasFreeVars) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/RecClosureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/RecClosureNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/RecClosureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/RecClosureNode.java index ac2dc549a..976fe988e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/function/RecClosureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/RecClosureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.function; +package com.rawlabs.snapi.truffle.ast.expressions.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; -import com.rawlabs.snapi.truffle.runtime.runtime.function.RecClosure; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.Function; +import com.rawlabs.snapi.truffle.runtime.function.RecClosure; public class RecClosureNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/ArrayOperationNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/ArrayOperationNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java index fc20911a5..4445d0b3d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/ArrayOperationNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable; +package com.rawlabs.snapi.truffle.ast.expressions.iterable; import com.oracle.truffle.api.dsl.GenerateInline; import com.oracle.truffle.api.dsl.GenerateUncached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.list.*; import java.util.ArrayList; public class ArrayOperationNodes { @@ -134,13 +134,13 @@ static ObjectList buildObject(Node node, Object[] array) { } @Specialization - static RawArrayList buildObject(Node node, Object array) { + static TruffleArrayList buildObject(Node node, Object array) { try { @SuppressWarnings("unchecked") ArrayList arrayList = (ArrayList) array; - return new RawArrayList(arrayList); + return new TruffleArrayList(arrayList); } catch (ClassCastException e) { - throw new RawTruffleInternalErrorException(e.getMessage(), e); + throw new TruffleInternalErrorException(e.getMessage(), e); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionBuildNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionBuildNode.java index 0c6e702b2..4edae901d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionBuildNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.ExpressionCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.ExpressionCollection; @NodeInfo(shortName = "Collection.Build") public class CollectionBuildNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionDistinctNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionDistinctNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java index 72287b04b..0fa346d57 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionDistinctNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.DistinctCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.DistinctCollection; @NodeInfo(shortName = "Collection.Distinct") @NodeChild("input") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionEquiJoinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionEquiJoinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java index a172ee776..ef98fbc52 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionEquiJoinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.EquiJoinCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.EquiJoinCollection; @NodeInfo(shortName = "Collection.EquiJoin") public class CollectionEquiJoinNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionExistsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionExistsNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionExistsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionExistsNode.java index a543b617b..2b87b10a3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionExistsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionExistsNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRExistsBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRExistsConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRExistsBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRExistsConditionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Collection.Exists") public class CollectionExistsNode extends ExpressionNode { @@ -81,7 +81,7 @@ public Object executeGeneric(VirtualFrame frame) { frame.setBoolean(predicateResultSlot, false); existsLoopNode.execute(frame); return frame.getBoolean(predicateResultSlot); - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } finally { generatorCloseNode.execute(this, generator); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFilterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFilterNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFilterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFilterNode.java index 97f56ef32..7755559e7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFilterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFilterNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.FilterCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.FilterCollection; @NodeInfo(shortName = "Collection.Filter") public class CollectionFilterNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFirstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFirstNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFirstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFirstNode.java index f8f2b51ea..85a20f4ca 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFirstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFirstNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Collection.First") @NodeChild("iterable") @@ -42,7 +42,7 @@ protected Object doObject( return NullObject.INSTANCE; } return next.execute(this, generator); - } catch (RawTruffleRuntimeException e) { + } catch (TruffleRuntimeException e) { return new ErrorObject(e.getMessage()); } finally { closeNode.execute(this, generator); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFromNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFromNode.java index bafe83a21..bb5db796b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionFromNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; @NodeInfo(shortName = "Collection.From") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionGroupByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionGroupByNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java index 9213818e5..bfa52694c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionGroupByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.GroupByCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.GroupByCollection; @NodeInfo(shortName = "Collection.GroupBy") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionJoinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionJoinNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java index 20a931242..608499f6b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionJoinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.JoinCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.JoinCollection; @NodeInfo(shortName = "Collection.Join") @NodeChild("left") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionMkStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionMkStringNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionMkStringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionMkStringNode.java index 9e722e485..0a678b2a2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionMkStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionMkStringNode.java @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRCollectionMkStringBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRCollectionMkStringBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Collection.MkString") public class CollectionMkStringNode extends ExpressionNode { @@ -111,7 +111,7 @@ public Object executeGeneric(VirtualFrame frame) { currentString = (String) frame.getObject(resultSlot); return currentString + end; - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } finally { closeNode.execute(this, generator); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionOrderByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionOrderByNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java index 38f45621c..457a5fb97 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionOrderByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.OrderByCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.OrderByCollection; @NodeInfo(shortName = "Collection.OrderBy") public class CollectionOrderByNode extends ExpressionNode { @@ -61,9 +61,9 @@ public Object executeGeneric(VirtualFrame frame) { String order = orderings[i].executeString(frame); if (order.equalsIgnoreCase("ASC")) orders[i] = 1; else if (order.equalsIgnoreCase("DESC")) orders[i] = -1; - else throw new RawTruffleRuntimeException("Invalid ordering: " + order); + else throw new TruffleRuntimeException("Invalid ordering: " + order); } catch (UnexpectedResultException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } Object[] keyFunctions = new Object[this.keyFuns.length]; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTakeNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTakeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTakeNode.java index 9964d1116..9ffe599d7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTakeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.TakeCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.TakeCollection; @NodeInfo(shortName = "Collection.Take") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTransformNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTransformNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTransformNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTransformNode.java index 8a511539a..fb8b9f533 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTransformNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTransformNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.TransformCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.TransformCollection; @NodeInfo(shortName = "Collection.Transform") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTupleAvgNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTupleAvgNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java index a0a39aaf5..333aba981 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionTupleAvgNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.*; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.*; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.math.BigDecimal; @NodeInfo(shortName = "Collection.TupleAvg") @@ -42,7 +42,7 @@ public CollectionTupleAvgNode(ExpressionNode iterableNode, int generatorSlot, in public Object executeGeneric(VirtualFrame virtualFrame) { Object[] results = (Object[]) aggregate.executeGeneric(virtualFrame); - Object record = RawLanguage.get(this).createPureRecord(); + Object record = Rql2Language.get(this).createPureRecord(); if ((long) results[1] == (long) zeroNode.execute(this, Aggregations.COUNT)) { addPropNode.execute(this, record, "sum", zeroNode.execute(this, Aggregations.SUM), false); } else { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionUnionNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionUnionNode.java index 460d2706a..7db724024 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionUnionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.UnionCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.UnionCollection; @NodeInfo(shortName = "Collection.Union") public class CollectionUnionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnnestNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionUnnestNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnnestNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionUnnestNode.java index 2813f8959..e78a30155 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionUnnestNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionUnnestNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.UnnestCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.UnnestCollection; @NodeInfo(shortName = "Collection.Unnest") @NodeChild("iterable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionZipNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionZipNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java index 3c1344430..24a676ba0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/collection/CollectionZipNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.collection; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.ZipCollection; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.ZipCollection; @NodeInfo(shortName = "Collection.Zip") @NodeChild("parent1") @@ -25,7 +25,7 @@ public abstract class CollectionZipNode extends ExpressionNode { @Specialization protected Object doZip(Object iterable1, Object iterable2) { - RawLanguage language = RawLanguage.get(this); + Rql2Language language = Rql2Language.get(this); return new ZipCollection(iterable1, iterable2, language); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java index dc038b14c..50d3db740 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.list.*; @NodeInfo(shortName = "List.Build") public class ListBuildNode extends ExpressionNode { @@ -114,7 +114,7 @@ public Object executeGeneric(VirtualFrame frame) { } } } catch (UnexpectedResultException ex) { - throw new RawTruffleInternalErrorException(ex, this); + throw new TruffleInternalErrorException(ex, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListCountNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListCountNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListCountNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListCountNode.java index 56d78ea95..8554242aa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListCountNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListCountNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; @NodeInfo(shortName = "List.Count") @NodeChild("list") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListExistsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListExistsNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListExistsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListExistsNode.java index a1016b216..807314d3a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListExistsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListExistsNode.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRExistsBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRExistsConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRExistsBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRExistsConditionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; @NodeInfo(shortName = "List.Exists") public class ListExistsNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFilterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFilterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java index ff7bda4fb..021506401 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFilterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java @@ -10,26 +10,26 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFilterBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListFilterBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.*; import java.util.ArrayList; @NodeInfo(shortName = "List.Filter") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFirstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFirstNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFirstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFirstNode.java index badf3c34a..f36cc98db 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFirstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFirstNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @ImportStatic(value = TypeGuards.class) @NodeInfo(shortName = "List.First") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java index bd49da9e4..32f36b75f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java @@ -10,29 +10,28 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFromBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListFromBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; import java.util.ArrayList; @ImportStatic(value = TypeGuards.class) @@ -117,7 +116,7 @@ public Object executeGeneric(VirtualFrame frame) { frame.setObject(listSlot, llist); toArrayLoopNode.execute(frame); return arrayBuildListNode.execute(this, frame.getObject(resultSlot)); - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } finally { generatorCloseNode.execute(this, generator); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromUnsafe.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromUnsafe.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java index 29415fc82..c068d03c2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListFromUnsafe.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java @@ -10,26 +10,25 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFromBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListFromBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; import java.util.ArrayList; @NodeInfo(shortName = "List.FromUnsafe") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGetNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGetNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGetNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGetNode.java index 59fc00588..dfc047ec4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGetNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGetNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "List.Get") @NodeChild("list") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGroupByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGroupByNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java index f4118b1e1..1dd8559f9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListGroupByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java @@ -10,31 +10,31 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; -import static com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers.getContextValues; +import static com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers.getContextValues; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListEquiJoinInitBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListFromBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.RawArrayList; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListEquiJoinInitBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListFromBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.TruffleArrayList; import java.util.ArrayList; @NodeInfo(shortName = "List.GroupBy") @@ -147,7 +147,7 @@ public Object executeGeneric(VirtualFrame frame) { listFromLoopNode.execute(frame); @SuppressWarnings("unchecked") ArrayList llist = (ArrayList) frame.getObject(listSlot); - return new RawArrayList(llist); + return new TruffleArrayList(llist); } finally { generatorCloseNode.execute(this, mapGenerator); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListLastNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListLastNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListLastNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListLastNode.java index 1d9e619d3..eb14130a8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListLastNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListLastNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @ImportStatic(value = TypeGuards.class) @NodeInfo(shortName = "List.Last") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTakeNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTakeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTakeNode.java index 307a82f5f..4479c8756 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTakeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.list.*; @ImportStatic(value = TypeGuards.class) @NodeInfo(shortName = "List.Take") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTransformNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTransformNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java index 071674e3e..c6c4e9fd5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/iterable/list/ListTransformNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java @@ -10,21 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; +package com.rawlabs.snapi.truffle.ast.expressions.iterable.list; import com.oracle.truffle.api.Truffle; -import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListTransformBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListTransformBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.runtime.list.*; @NodeInfo(shortName = "List.Transform") public class ListTransformNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BinaryConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/BinaryConstNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BinaryConstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/BinaryConstNode.java index d318f662c..f4f28134f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BinaryConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/BinaryConstNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; public class BinaryConstNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BoolNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/BoolNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BoolNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/BoolNode.java index 6e1f80f8e..49f7055a2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/BoolNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/BoolNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public final class BoolNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ByteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ByteNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ByteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ByteNode.java index 83f4a9b41..dee257426 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ByteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ByteNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class ByteNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DecimalNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/DecimalNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DecimalNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/DecimalNode.java index dcc9eead4..28175bb95 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DecimalNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/DecimalNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; import java.math.BigDecimal; public class DecimalNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DoubleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/DoubleNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DoubleNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/DoubleNode.java index 3d1768a29..c8de42fa8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/DoubleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/DoubleNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public final class DoubleNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/FloatNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/FloatNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/FloatNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/FloatNode.java index d97448b40..88a929506 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/FloatNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/FloatNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class FloatNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/IntNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/IntNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/IntNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/IntNode.java index 268c79b6f..9e2a44b1c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/IntNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/IntNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public final class IntNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LocationConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LocationConstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java index b24f9407d..3773c4ce6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LocationConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; import com.rawlabs.utils.sources.api.Location; @@ -33,7 +33,7 @@ public LocationConstNode(byte[] value, String publicDescription) { @Override public final Object executeGeneric(VirtualFrame virtualFrame) { - RawSettings rawSettings = RawContext.get(this).getSettings(); + RawSettings rawSettings = Rql2Context.get(this).getSettings(); Location location = getLocation(rawSettings); return new LocationObject(location, publicDescription); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LongNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LongNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LongNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LongNode.java index cbaccc643..9059484d7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/LongNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LongNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public final class LongNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ShortNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ShortNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ShortNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ShortNode.java index a586e94c6..b95854a86 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ShortNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ShortNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class ShortNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/StringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/StringNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/StringNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/StringNode.java index 54f2d2e6f..87e90c76e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/StringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/StringNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public final class StringNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UndefinedNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/UndefinedNode.java similarity index 66% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UndefinedNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/UndefinedNode.java index d123efed9..7d25aabbd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UndefinedNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/UndefinedNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; public class UndefinedNode extends ExpressionNode { @@ -22,6 +22,6 @@ public UndefinedNode() {} @Override public Object executeGeneric(VirtualFrame virtualFrame) { - throw new RawTruffleRuntimeException("Should never execute undefined node", this); + throw new TruffleRuntimeException("Should never execute undefined node", this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UnitNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/UnitNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UnitNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/UnitNode.java index f7de70ce7..acb19f69c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/UnitNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/UnitNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public final class UnitNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ZeroedConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ZeroedConstNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java index 534adbfca..dacb88809 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/literals/ZeroedConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; +package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class ZeroedConstNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionFlatMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionFlatMapNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionFlatMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionFlatMapNode.java index e62d2870a..ed36160c4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionFlatMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionFlatMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Option.FlatMap") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionGetOrElseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionGetOrElseNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionGetOrElseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionGetOrElseNode.java index 4a63bd375..56018346a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionGetOrElseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionGetOrElseNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Option.FlatMap") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionIsDefinedNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionIsDefinedNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionIsDefinedNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionIsDefinedNode.java index 634084bb6..cc62fcaca 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionIsDefinedNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionIsDefinedNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Option.IsDefined") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionMapNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionMapNode.java index 7155acb18..b7413b395 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Option.Map") @NodeChild("option") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionNoneNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionNoneNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionNoneNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionNoneNode.java index 79f055b28..dc1db35bf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionNoneNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionNoneNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Option.None") public class OptionNoneNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionSomeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionSomeNode.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionSomeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionSomeNode.java index 4c42881e5..ed1f86e3a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionSomeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionSomeNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeChild("value") public abstract class OptionSomeNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionUnsafeGetNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionUnsafeGetNode.java similarity index 69% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionUnsafeGetNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionUnsafeGetNode.java index 5c1a4a436..eb5d50b81 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/option/OptionUnsafeGetNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/option/OptionUnsafeGetNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.option; +package com.rawlabs.snapi.truffle.ast.expressions.option; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleUnexpectedNullException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleUnexpectedNullException; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "Option.UnsafeGet") @NodeChild("option") @@ -28,7 +28,7 @@ public abstract class OptionUnsafeGetNode extends ExpressionNode { @Specialization(guards = "isNull(option)") protected Object doObject(NullObject option) { - throw new RawTruffleUnexpectedNullException(this); + throw new TruffleUnexpectedNullException(this); } @Specialization(guards = "!isNull(option)") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordAddFieldNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordAddFieldNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java index 00ac029c3..c2fe8f70f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordAddFieldNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.ArrayList; import java.util.List; @@ -40,7 +40,7 @@ protected static Object doAddField( String newKey, Object newValue, @Bind("$node") Node thisNode, - @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) RawLanguage lang, + @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) Rql2Language lang, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode, @Cached(value = "getKeysNode.execute(thisNode, rec)", neverDefault = true, dimensions = 1) Object[] objKeys, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordBuildNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java index 25e7cfa93..161e4476a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.List; @NodeInfo(shortName = "Record.Build") @@ -33,7 +33,7 @@ public class RecordBuildNode extends ExpressionNode { private final boolean hasDuplicateKeys; - private final RawLanguage language = RawLanguage.get(this); + private final Rql2Language language = Rql2Language.get(this); public RecordBuildNode(ExpressionNode[] elementsNodes, String[] keys) { CompilerAsserts.compilationConstant(elementsNodes.length); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordConcatNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordConcatNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java index fb706bbf3..4e16f606f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordConcatNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.ArrayList; import java.util.List; @@ -40,7 +40,7 @@ protected static Object doConcat( Object rec1, Object rec2, @Bind("$node") Node thisNode, - @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) RawLanguage lang, + @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) Rql2Language lang, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode1, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode2, @Cached(value = "getKeysNode1.execute(thisNode, rec1)", neverDefault = true, dimensions = 1) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordFieldsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordFieldsNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordFieldsNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordFieldsNode.java index d36262832..78c639d99 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordFieldsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordFieldsNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.Arrays; @NodeInfo(shortName = "Record.Fields") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordProjNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordProjNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordProjNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordProjNode.java index e1f810b16..cdf52a91b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordProjNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordProjNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; @NodeInfo(shortName = "Record.Project") @NodeChild("receiverNode") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordRemoveFieldNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordRemoveFieldNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java index f519f4e50..8bd65554c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordRemoveFieldNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ protected static Object doRemoveField( Object record, Object dropKey, @Bind("$node") Node thisNode, - @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) RawLanguage lang, + @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) Rql2Language lang, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode, @Cached(value = "getKeysNode.execute(thisNode, record)", neverDefault = true, dimensions = 1) Object[] objKeys, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordStaticInitializers.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordStaticInitializers.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java index d3ebbe974..60ef5ed40 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/record/RecordStaticInitializers.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.record; +package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.ArrayList; import java.util.List; public class RecordStaticInitializers { - public static RawLanguage getCachedLanguage(Node node) { - return RawLanguage.get(node); + public static Rql2Language getCachedLanguage(Node node) { + return Rql2Language.get(node); } public static boolean hasDuplicateKeys(Object[] keys) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFailureNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFailureNode.java index 5a833d02d..176cbf9b0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFailureNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Tryable.Failure") @NodeChild("message") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureWithTypeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFailureWithTypeNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureWithTypeNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFailureWithTypeNode.java index 7399c4b06..b8d0d714c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFailureWithTypeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFailureWithTypeNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Tryable.FailureWithType") @NodeChild("message") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFlatMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFlatMapNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFlatMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFlatMapNode.java index 6f6ec0034..3883a4734 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableFlatMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableFlatMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Tryable.FlatMap") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableGetFailureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableGetFailureNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableGetFailureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableGetFailureNode.java index 9146d9f18..33b539c0b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableGetFailureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableGetFailureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Tryable.GetFailure") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsFailureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableIsFailureNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsFailureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableIsFailureNode.java index 725f9f659..31204330c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsFailureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableIsFailureNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Tryable.isError") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsSuccessNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableIsSuccessNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsSuccessNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableIsSuccessNode.java index 49069228e..209e0b81f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableIsSuccessNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableIsSuccessNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; @NodeInfo(shortName = "Tryable.isSuccess") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableMapNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableMapNode.java index 037b5be3c..1c18a3967 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableMapNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Tryable.Map") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableNullableFlatMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableNullableFlatMapNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableNullableFlatMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableNullableFlatMapNode.java index e2719b484..6921752b7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableNullableFlatMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableNullableFlatMapNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "TryableNullable.FlatMap") @NodeChild("tryable") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableSuccessNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableSuccessNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableSuccessNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableSuccessNode.java index 4ad06cd8d..2e1c7a97f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableSuccessNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableSuccessNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Tryable.Success") @NodeChild("value") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableUnsafeGetNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableUnsafeGetNode.java similarity index 67% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableUnsafeGetNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableUnsafeGetNode.java index 03840c6e2..d7ca351c5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/tryable/TryableUnsafeGetNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/tryable/TryableUnsafeGetNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; +package com.rawlabs.snapi.truffle.ast.expressions.tryable; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.ImportStatic; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "Try.UnsafeGet") @NodeChild("tryable") @@ -31,7 +31,7 @@ public abstract class TryableUnsafeGetNode extends ExpressionNode { protected Object exec( ErrorObject tryable, @Cached(inline = true) TryableNullableNodes.GetErrorNode getFailureNode) { - throw new RawTruffleRuntimeException(getFailureNode.execute(this, tryable), this); + throw new TruffleRuntimeException(getFailureNode.execute(this, tryable), this); } @Specialization(guards = "!isError(tryable)") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NegNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NegNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NegNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NegNode.java index 0597f3850..00400638f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NegNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NegNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; +package com.rawlabs.snapi.truffle.ast.expressions.unary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeChild("value") public abstract class NegNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NotNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NotNode.java index cff94f287..9e8c7c11e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NotNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; +package com.rawlabs.snapi.truffle.ast.expressions.unary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeChild("value") public abstract class NotNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNullNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NotNullNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNullNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NotNullNode.java index d90dc90e4..981963cba 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/expressions/unary/NotNullNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/unary/NotNullNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; +package com.rawlabs.snapi.truffle.ast.expressions.unary; import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeChild("value") public abstract class NotNullNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryBytesWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryBytesWriterNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryBytesWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryBytesWriterNode.java index 536d22923..bf95aff9e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryBytesWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryBytesWriterNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.binary; +package com.rawlabs.snapi.truffle.ast.io.binary; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; import java.io.IOException; import java.io.OutputStream; @@ -36,7 +36,7 @@ private void doWrite(Object[] args) { try { output.write(binaryData); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java index af10ad88b..12b10c61e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/BinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.binary; +package com.rawlabs.snapi.truffle.ast.io.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; import java.io.OutputStream; @NodeInfo(shortName = "Binary.Write") @@ -28,7 +28,7 @@ public class BinaryWriterNode extends StatementNode { @Child private DirectCallNode innerWriter; - private final OutputStream os = RawContext.get(this).getOutput(); + private final OutputStream os = Rql2Context.get(this).getOutput(); public BinaryWriterNode(ExpressionNode binaryNode, ProgramStatementNode innerWriter) { this.innerWriter = DirectCallNode.create(innerWriter.getCallTarget()); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/NullableBinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/NullableBinaryWriterNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/NullableBinaryWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/NullableBinaryWriterNode.java index d4c249cdb..939954212 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/NullableBinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/NullableBinaryWriterNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.binary; +package com.rawlabs.snapi.truffle.ast.io.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; import java.io.OutputStream; @NodeInfo(shortName = "Binary.NullableWrite") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/TryableBinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/TryableBinaryWriterNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/TryableBinaryWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/TryableBinaryWriterNode.java index 9264dbd9d..868a868a3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/binary/TryableBinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/TryableBinaryWriterNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.binary; +package com.rawlabs.snapi.truffle.ast.io.binary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.binary.BinaryWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.binary.BinaryWriterTruffleException; import java.io.OutputStream; @NodeInfo(shortName = "Binary.TryableWrite") @@ -49,7 +49,7 @@ public void executeVoid(VirtualFrame frame) { innerWriter.call(tryable, output); } else { // else throw. - throw new BinaryWriterRawTruffleException(getFailureNode.execute(this, tryable), this); + throw new BinaryWriterTruffleException(getFailureNode.execute(this, tryable), this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/CsvParserNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/CsvParserNodes.java similarity index 58% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/CsvParserNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/CsvParserNodes.java index 9b5938e74..62df17f3e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/CsvParserNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/CsvParserNodes.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader; +package com.rawlabs.snapi.truffle.ast.io.csv.reader; import com.oracle.truffle.api.dsl.GenerateInline; import com.oracle.truffle.api.dsl.GenerateUncached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParser; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; public class CsvParserNodes { @@ -28,13 +28,13 @@ public class CsvParserNodes { @GenerateInline public abstract static class InitCsvParserNode extends Node { - public abstract RawTruffleCsvParser execute( - Node node, Object value, RawTruffleCsvParserSettings settings); + public abstract TruffleCsvParser execute( + Node node, Object value, TruffleCsvParserSettings settings); @Specialization - RawTruffleCsvParser initParserFromStream( - Node node, RawTruffleCharStream stream, RawTruffleCsvParserSettings settings) { - return new RawTruffleCsvParser(stream, settings); + TruffleCsvParser initParserFromStream( + Node node, TruffleCharStream stream, TruffleCsvParserSettings settings) { + return new TruffleCsvParser(stream, settings); } } @@ -43,10 +43,10 @@ RawTruffleCsvParser initParserFromStream( @GenerateInline public abstract static class CloseCsvParserNode extends Node { - public abstract void execute(Node node, RawTruffleCsvParser parser); + public abstract void execute(Node node, TruffleCsvParser parser); @Specialization - void closeParserSilently(Node node, RawTruffleCsvParser parser) { + void closeParserSilently(Node node, TruffleCsvParser parser) { if (parser != null) { parser.close(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/BoolParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/BoolParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/BoolParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/BoolParseCsvNode.java index d3e5c9c4c..29bab9d05 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/BoolParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/BoolParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "BoolParseCsv") public class BoolParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getBool(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DateParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DateParseCsvNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DateParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DateParseCsvNode.java index b1c28131e..bebc3d07d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DateParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DateParseCsvNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "DateParseCsv") public class DateParseCsvNode extends ExpressionNode { public DateObject executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getDate(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DecimalParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DecimalParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DecimalParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DecimalParseCsvNode.java index 55344a62e..a0ab8b562 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DecimalParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DecimalParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "DecimalParseCsv") public class DecimalParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getDecimal(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DoubleParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DoubleParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DoubleParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DoubleParseCsvNode.java index 07351980d..7a2f5c996 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/DoubleParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/DoubleParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "DoubleParseCsv") public class DoubleParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getDouble(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IntParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IntParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IntParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IntParseCsvNode.java index 2f0012712..9ac9cb32a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IntParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IntParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "IntParseCsv") public class IntParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getInt(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvFile.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IterableParseCsvFile.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvFile.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IterableParseCsvFile.java index 7e1755002..e2e61dded 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvFile.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IterableParseCsvFile.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.CsvCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.CsvCollection; +import com.rawlabs.snapi.truffle.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @NodeInfo(shortName = "IterableParseCsvFile") public class IterableParseCsvFile extends ExpressionNode { @@ -101,8 +101,8 @@ public Object executeGeneric(VirtualFrame frame) { String dateFormat = dateFormatExp.executeString(frame); String timeFormat = timeFormatExp.executeString(frame); String datetimeFormat = datetimeFormatExp.executeString(frame); - RawTruffleCsvParserSettings settings = - new RawTruffleCsvParserSettings( + TruffleCsvParserSettings settings = + new TruffleCsvParserSettings( delimiterValue.charAt(0), useQuote, quoteChar, @@ -115,7 +115,7 @@ public Object executeGeneric(VirtualFrame frame) { datetimeFormat); return new CsvCollection(locationValue, parserRootCallTarget, encodingValue, settings); } catch (UnexpectedResultException ex) { - throw new CsvParserRawTruffleException(ex.getMessage(), 0, 0, ex, this); + throw new CsvParserTruffleException(ex.getMessage(), 0, 0, ex, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvString.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IterableParseCsvString.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvString.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IterableParseCsvString.java index 97b2716ec..bcde938f4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/IterableParseCsvString.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/IterableParseCsvString.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.CsvFromStringCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.CsvFromStringCollection; +import com.rawlabs.snapi.truffle.runtime.list.StringList; @NodeInfo(shortName = "IterableParseCsvString") public class IterableParseCsvString extends ExpressionNode { @@ -97,8 +97,8 @@ public Object executeGeneric(VirtualFrame frame) { String dateFormat = dateFormatExp.executeString(frame); String timeFormat = timeFormatExp.executeString(frame); String datetimeFormat = datetimeFormatExp.executeString(frame); - RawTruffleCsvParserSettings settings = - new RawTruffleCsvParserSettings( + TruffleCsvParserSettings settings = + new TruffleCsvParserSettings( delimiterValue.charAt(0), useQuote, quoteChar, @@ -111,7 +111,7 @@ public Object executeGeneric(VirtualFrame frame) { datetimeFormat); return new CsvFromStringCollection(str, parserRootCallTarget, settings); } catch (UnexpectedResultException ex) { - throw new CsvParserRawTruffleException(ex.getMessage(), 0, 0, ex, this); + throw new CsvParserTruffleException(ex.getMessage(), 0, 0, ex, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/LongParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/LongParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/LongParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/LongParseCsvNode.java index 5d8022c26..a811f2d01 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/LongParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/LongParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "IntParseCsv") public class LongParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getLong(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java index 83896169f..beac306b6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionBoolParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionBoolParseCsv") public class OptionBoolParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionBool(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionByteParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionByteParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionByteParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionByteParseCsvNode.java index 884ebfbb0..0b82edc76 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionByteParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionByteParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionByteParseCsv") public class OptionByteParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionByte(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDateParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDateParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDateParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDateParseCsvNode.java index a5283060e..27504923b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDateParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDateParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionDateParseCsv") public class OptionDateParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionDate(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java index e70eb9446..04de88c0e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDecimalParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionDecimalParseCsv") public class OptionDecimalParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionDecimal(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java index e4c2e2168..916d0596c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionDoubleParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionDoubleParseCsv") public class OptionDoubleParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionDouble(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java index 0f686e588..7e01889c2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionFloatParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionFloatParseCsv") public class OptionFloatParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionFloat(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionIntParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionIntParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionIntParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionIntParseCsvNode.java index c4acdb15e..2c42b385d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionIntParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionIntParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionIntParseCsv") public class OptionIntParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionInt(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionLongParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionLongParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionLongParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionLongParseCsvNode.java index f668285c8..a3cfd3946 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionLongParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionLongParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionLongParseCsv") public class OptionLongParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionLong(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionShortParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionShortParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionShortParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionShortParseCsvNode.java index c80cf8b6f..85b8dcaab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionShortParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionShortParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionShortParseCsv") public class OptionShortParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionShort(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionStringParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionStringParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionStringParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionStringParseCsvNode.java index 5beeb911a..04096828e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionStringParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionStringParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionStringParseCsv") public class OptionStringParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionString(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java index 2ea3982ab..6ca3291fd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionTimeParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionTimeParseCsv") public class OptionTimeParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionTime(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java index 59f060a36..fe4e71f7a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionTimestampParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionTimestampParseCsv") public class OptionTimestampParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionTimestamp(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java index b4b83a93c..b579b807f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/OptionUndefinedParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "OptionUndefinedParseCsv") public class OptionUndefinedParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getOptionUndefined(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RecordParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RecordParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java index 2d9537f90..6a989bbd3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RecordParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.Arrays; import java.util.List; @@ -35,7 +35,7 @@ public class RecordParseCsvNode extends ExpressionNode { private final Rql2AttrType[] columns; private final boolean hasDuplicateKeys; - private final RawLanguage language = RawLanguage.get(this); + private final Rql2Language language = Rql2Language.get(this); public RecordParseCsvNode(ProgramExpressionNode[] columnParsers, Rql2AttrType[] columns) { this.columns = columns; @@ -57,7 +57,7 @@ public RecordParseCsvNode(ProgramExpressionNode[] columnParsers, Rql2AttrType[] @ExplodeLoop public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; assert (parser.startingNewLine(this)); Object record; if (hasDuplicateKeys) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/ShortParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/ShortParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/ShortParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/ShortParseCsvNode.java index 0861de85f..ac5b333b8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/ShortParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/ShortParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "ShortParseCsv") public class ShortParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getByte(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/StringParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/StringParseCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/StringParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/StringParseCsvNode.java index 1312db181..8c6da6fd8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/StringParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/StringParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "StringParseCsv") public class StringParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getString(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimeParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TimeParseCsvNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimeParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TimeParseCsvNode.java index ee90c73de..aaf2964e7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimeParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TimeParseCsvNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeParseCsv") public class TimeParseCsvNode extends ExpressionNode { public TimeObject executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getTime(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimestampParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TimestampParseCsvNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimestampParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TimestampParseCsvNode.java index 1d094985d..d809c8327 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TimestampParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TimestampParseCsvNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampParseCsv") public class TimestampParseCsvNode extends ExpressionNode { public TimestampObject executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getTimestamp(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java index 9cd112a36..273fbbe17 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonToken; @@ -19,15 +19,15 @@ import com.fasterxml.jackson.dataformat.csv.CsvSchema; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLogger; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvExpectedNothingException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; import java.io.IOException; import java.io.Reader; import java.time.LocalDate; @@ -37,7 +37,7 @@ import java.time.format.DateTimeParseException; import java.util.Objects; -public class RawTruffleCsvParser { +public class TruffleCsvParser { final String[] nulls; final String[] nans; @@ -46,10 +46,10 @@ public class RawTruffleCsvParser { final DateTimeFormatter dateFormatter, timeFormatter, timestampFormatter; private final CsvParser jacksonParser; - final RawTruffleCharStream stream; + final TruffleCharStream stream; @TruffleBoundary - public RawTruffleCsvParser(RawTruffleCharStream stream, RawTruffleCsvParserSettings settings) { + public TruffleCsvParser(TruffleCharStream stream, TruffleCsvParserSettings settings) { this.stream = stream; try { this.nulls = settings.nulls; @@ -75,7 +75,7 @@ public RawTruffleCsvParser(RawTruffleCharStream stream, RawTruffleCsvParserSetti builder.setEscapeChar(settings.escapeChar); jacksonParser.setSchema(builder.build()); } catch (IOException | IllegalArgumentException ex) { - throw new CsvReaderRawTruffleException(stream, ex); + throw new CsvReaderTruffleException(stream, ex); } } @@ -97,12 +97,12 @@ void getNextField() { return; } if (token == null) { - throw new CsvReaderRawTruffleException("unexpected EOF", this, stream); + throw new CsvReaderTruffleException("unexpected EOF", this, stream); } else if (token == JsonToken.END_ARRAY) { - throw new CsvReaderRawTruffleException("not enough columns found", this, stream); + throw new CsvReaderTruffleException("not enough columns found", this, stream); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex); + throw new CsvReaderTruffleException(stream, ex); } } @@ -121,13 +121,13 @@ public void finishLine(ExpressionNode location) { try { token = jacksonParser.nextToken(); } catch (IOException ex) { - throw new CsvParserRawTruffleException(this, ex, location); + throw new CsvParserTruffleException(this, ex, location); } } while (token != null && token != JsonToken.END_ARRAY); } private static final TruffleLogger LOG = - TruffleLogger.getLogger(RawLanguage.ID, RawTruffleRuntimeException.class); + TruffleLogger.getLogger(Rql2Language.ID, TruffleRuntimeException.class); @TruffleBoundary public void close() { @@ -152,7 +152,7 @@ public void skipHeaderLines() { } while (token != JsonToken.END_ARRAY); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex); + throw new CsvReaderTruffleException(stream, ex); } } @@ -161,7 +161,7 @@ public boolean done() { try { return jacksonParser.nextToken() == null; } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex); + throw new CsvReaderTruffleException(stream, ex); } } @@ -173,11 +173,11 @@ byte getByte(ExpressionNode location) { } catch (JsonProcessingException ex) { String malformed = jacksonParser.getText(); // shouldn't throw since we read already the token - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a byte", malformed), this, stream, ex, location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -193,7 +193,7 @@ Object getOptionByte(ExpressionNode location) { } return jacksonParser.getByteValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a byte", jacksonParser.getText()), this, stream, @@ -201,7 +201,7 @@ Object getOptionByte(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -217,7 +217,7 @@ Object getOptionShort(ExpressionNode location) { } return jacksonParser.getShortValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a short", jacksonParser.getText()), this, stream, @@ -225,7 +225,7 @@ Object getOptionShort(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -237,11 +237,11 @@ int getInt(ExpressionNode location) { } catch (JsonProcessingException ex) { String malformed = jacksonParser.getText(); // shouldn't throw since we read already the token - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as an int", malformed), this, stream, ex, location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -257,7 +257,7 @@ Object getOptionInt(ExpressionNode location) { } return jacksonParser.getIntValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as an int", jacksonParser.getText()), this, stream, @@ -265,7 +265,7 @@ Object getOptionInt(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -277,11 +277,11 @@ long getLong(ExpressionNode location) { } catch (JsonProcessingException ex) { String malformed = jacksonParser.getText(); // shouldn't throw since we read already the token - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a long", malformed), this, stream, ex, location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -297,7 +297,7 @@ Object getOptionLong(ExpressionNode location) { } return jacksonParser.getLongValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a long", jacksonParser.getText()), this, stream, @@ -305,7 +305,7 @@ Object getOptionLong(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -326,7 +326,7 @@ Object getOptionFloat(ExpressionNode location) { } return jacksonParser.getFloatValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a float", jacksonParser.getText()), this, stream, @@ -334,7 +334,7 @@ Object getOptionFloat(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -350,7 +350,7 @@ Object getOptionFloat(ExpressionNode location) { } return jacksonParser.getDoubleValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a double", jacksonParser.getText()), this, stream, @@ -358,7 +358,7 @@ Object getOptionFloat(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -379,7 +379,7 @@ Object getOptionDouble(ExpressionNode location) { } return jacksonParser.getDoubleValue(); } catch (JsonProcessingException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a double", jacksonParser.getText()), this, stream, @@ -387,7 +387,7 @@ Object getOptionDouble(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -400,11 +400,11 @@ DecimalObject getDecimal(ExpressionNode location) { } catch (JsonProcessingException | NumberFormatException ex) { String malformed = jacksonParser.getText(); // shouldn't throw since we read already the token - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a decimal", malformed), this, stream, ex, location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -420,7 +420,7 @@ Object getOptionDecimal(ExpressionNode location) { } return new DecimalObject(jacksonParser.getDecimalValue()); } catch (JsonProcessingException | NumberFormatException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a decimal", jacksonParser.getText()), this, stream, @@ -428,7 +428,7 @@ Object getOptionDecimal(ExpressionNode location) { location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -442,11 +442,11 @@ boolean getBool(ExpressionNode location) { } else if (Objects.equals(normalized, "false")) { return false; } else { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a bool", text), this, stream, location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -462,7 +462,7 @@ Object getOptionUndefined(ExpressionNode location) { } throw new CsvExpectedNothingException(text, this, stream, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -472,7 +472,7 @@ Object getUndefined(ExpressionNode location) { String text = jacksonParser.getText(); throw new CsvExpectedNothingException(text, this, stream, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -491,11 +491,11 @@ Object getOptionBool(ExpressionNode location) { return NullObject.INSTANCE; } } - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format("cannot parse '%s' as a bool", text), this, stream, location); } } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -504,7 +504,7 @@ String getString(ExpressionNode location) { try { return jacksonParser.getText(); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -519,7 +519,7 @@ Object getOptionString(ExpressionNode location) { } return token; } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -529,7 +529,7 @@ public DateObject getDate(ExpressionNode location) { String token = jacksonParser.getText(); return new DateObject(LocalDate.parse(token, dateFormatter)); } catch (DateTimeParseException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format( "string '%s' does not match date template '%s'", ex.getParsedString(), dateFormat), this, @@ -537,7 +537,7 @@ public DateObject getDate(ExpressionNode location) { ex, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -552,7 +552,7 @@ Object getOptionDate(ExpressionNode location) { } return new DateObject(LocalDate.parse(token, dateFormatter)); } catch (DateTimeParseException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format( "string '%s' does not match date template '%s'", ex.getParsedString(), dateFormat), this, @@ -560,7 +560,7 @@ Object getOptionDate(ExpressionNode location) { ex, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -570,7 +570,7 @@ public TimeObject getTime(ExpressionNode location) { String token = jacksonParser.getText(); return new TimeObject(LocalTime.parse(token, timeFormatter)); } catch (DateTimeParseException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format( "string '%s' does not match time template '%s'", ex.getParsedString(), timeFormat), this, @@ -578,7 +578,7 @@ public TimeObject getTime(ExpressionNode location) { ex, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -593,7 +593,7 @@ Object getOptionTime(ExpressionNode location) { } return new TimeObject(LocalTime.parse(token, timeFormatter)); } catch (DateTimeParseException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format( "string '%s' does not match time template '%s'", ex.getParsedString(), timeFormat), this, @@ -601,7 +601,7 @@ Object getOptionTime(ExpressionNode location) { ex, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -611,7 +611,7 @@ public TimestampObject getTimestamp(ExpressionNode location) { String token = jacksonParser.getText(); return new TimestampObject(LocalDateTime.parse(token, timestampFormatter)); } catch (DateTimeParseException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format( "string '%s' does not match timestamp template '%s'", ex.getParsedString(), timestampFormat), @@ -620,7 +620,7 @@ public TimestampObject getTimestamp(ExpressionNode location) { ex, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } @@ -635,7 +635,7 @@ Object getOptionTimestamp(ExpressionNode location) { } return new TimestampObject(LocalDateTime.parse(token, timestampFormatter)); } catch (DateTimeParseException ex) { - throw new CsvParserRawTruffleException( + throw new CsvParserTruffleException( String.format( "string '%s' does not match timestamp template '%s'", ex.getParsedString(), timeFormat), @@ -644,7 +644,7 @@ Object getOptionTimestamp(ExpressionNode location) { ex, location); } catch (IOException ex) { - throw new CsvReaderRawTruffleException(stream, ex, location); + throw new CsvReaderTruffleException(stream, ex, location); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParserSettings.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParserSettings.java index 762326f61..c66440461 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/RawTruffleCsvParserSettings.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParserSettings.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; -public class RawTruffleCsvParserSettings { +public class TruffleCsvParserSettings { public final char delimiter; public final boolean useQuote; @@ -25,7 +25,7 @@ public class RawTruffleCsvParserSettings { public final String timeFormat; public final String timestampFormat; - public RawTruffleCsvParserSettings( + public TruffleCsvParserSettings( char delimiter, boolean useQuote, char quoteChar, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TryableParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TryableParseCsvNode.java similarity index 68% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TryableParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TryableParseCsvNode.java index c64321993..174e48367 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/TryableParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TryableParseCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseCsv") public class TryableParseCsvNode extends ExpressionNode { @@ -31,10 +31,10 @@ public TryableParseCsvNode(ProgramExpressionNode innerParse) { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; try { return innerParse.call(parser); - } catch (CsvParserRawTruffleException ex) { + } catch (CsvParserTruffleException ex) { return new ErrorObject(ex.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/UndefinedParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/UndefinedParseCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/UndefinedParseCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/UndefinedParseCsvNode.java index a465226c4..5b006d8aa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/reader/parser/UndefinedParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/UndefinedParseCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.csv.reader.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "UndefinedParseCsv") public class UndefinedParseCsvNode extends ExpressionNode { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleCsvParser parser = (RawTruffleCsvParser) args[0]; + TruffleCsvParser parser = (TruffleCsvParser) args[0]; return parser.getUndefined(this); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvIterableWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvIterableWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java index 949967016..f038fde46 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvIterableWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer; +package com.rawlabs.snapi.truffle.ast.io.csv.writer; import static com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING; @@ -22,14 +22,14 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; import java.io.IOException; import java.io.OutputStream; @@ -62,7 +62,7 @@ public class CsvIterableWriterNode extends StatementNode { private final String[] columnNames; private final String lineSeparator; - private final OutputStream os = RawContext.get(this).getOutput(); + private final OutputStream os = Rql2Context.get(this).getOutput(); public CsvIterableWriterNode( ExpressionNode dataNode, @@ -86,7 +86,7 @@ public void executeVoid(VirtualFrame frame) { itemWriter.call(item, gen); } } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } finally { generatorCloseNode.execute(this, generator); } @@ -110,7 +110,7 @@ private CsvGenerator createGenerator(OutputStream os) { generator.enable(STRICT_CHECK_FOR_QUOTING); return generator; } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvListWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvListWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java index 39c944908..7e4e8615b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/CsvListWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer; +package com.rawlabs.snapi.truffle.ast.io.csv.writer; import static com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING; @@ -22,13 +22,13 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; import java.io.IOException; import java.io.OutputStream; @@ -55,7 +55,7 @@ public CsvListWriterNode( itemWriter = DirectCallNode.create(writeRootCallTarget); this.columnNames = columnNames; this.lineSeparator = lineSeparator; - this.os = RawContext.get(this).getOutput(); + this.os = Rql2Context.get(this).getOutput(); } @Override @@ -68,7 +68,7 @@ public void executeVoid(VirtualFrame frame) { itemWriter.call(item, gen); } } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } @@ -90,7 +90,7 @@ private CsvGenerator createGenerator(OutputStream os) { generator.enable(STRICT_CHECK_FOR_QUOTING); return generator; } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BinaryWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/BinaryWriteCsvNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BinaryWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/BinaryWriteCsvNode.java index aa05d3cb1..14c8ba7dc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BinaryWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/BinaryWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; import java.io.IOException; import java.util.Base64; @@ -39,7 +39,7 @@ private void doWrite(byte[] value, CsvGenerator gen) { String result = Base64.getEncoder().encodeToString(value); gen.writeString(result); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BoolWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/BoolWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BoolWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/BoolWriteCsvNode.java index ee2c877e8..33c365f94 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/BoolWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/BoolWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "BoolWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(boolean value, CsvGenerator gen) { try { gen.writeBoolean(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ByteWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/ByteWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ByteWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/ByteWriteCsvNode.java index 9a6e72098..980e9b03d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ByteWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/ByteWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "ByteWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(byte value, CsvGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DateWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DateWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DateWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DateWriteCsvNode.java index c795bc697..9ce0a7cbd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DateWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DateWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; import java.io.IOException; import java.time.format.DateTimeFormatter; @@ -42,7 +42,7 @@ private void doWrite(DateObject value, CsvGenerator gen) { // We consider it as an internal error and let it propagate. gen.writeString(formatter.format(value.getDate())); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DecimalWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DecimalWriteCsvNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DecimalWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DecimalWriteCsvNode.java index 7c80557c7..f10331147 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DecimalWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DecimalWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; import java.io.IOException; @NodeInfo(shortName = "DecimalWriteCsv") @@ -37,7 +37,7 @@ private void doWrite(DecimalObject value, CsvGenerator gen) { try { gen.writeNumber(value.getBigDecimal()); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DoubleWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DoubleWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DoubleWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DoubleWriteCsvNode.java index 8fb666abf..92491883a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/DoubleWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/DoubleWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "DoubleWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(double value, CsvGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/FloatWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/FloatWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/FloatWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/FloatWriteCsvNode.java index d9bbda182..892167916 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/FloatWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/FloatWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "FloatWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(float value, CsvGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/IntWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/IntWriteCsvNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/IntWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/IntWriteCsvNode.java index 89c3ba83f..6f3f551a0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/IntWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/IntWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "IntWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(int value, CsvGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/LongWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/LongWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/LongWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/LongWriteCsvNode.java index da3c13939..6d07a539b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/LongWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/LongWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "LongWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(long value, CsvGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/NullableWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/NullableWriteCsvNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/NullableWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/NullableWriteCsvNode.java index a1c89b04a..3e977061a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/NullableWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/NullableWriteCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "NullableWriteCsv") @@ -53,7 +53,7 @@ private void doWriteNull(CsvGenerator gen) { try { gen.writeString("null"); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/RecordWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/RecordWriteCsvNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/RecordWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/RecordWriteCsvNode.java index 20e7a23be..8e9c7d210 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/RecordWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/RecordWriteCsvNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; @@ -21,12 +21,12 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.io.IOException; @NodeInfo(shortName = "RecordWriteCsv") @@ -61,7 +61,7 @@ public void executeVoid(VirtualFrame frame) { } doEndRow(generator); } catch (UnsupportedMessageException | InvalidArrayIndexException e) { - throw new RawTruffleInternalErrorException(e, this); + throw new TruffleInternalErrorException(e, this); } } @@ -70,7 +70,7 @@ private void doStartRow(CsvGenerator gen) { try { gen.writeStartArray(); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } @@ -79,7 +79,7 @@ private void doEndRow(CsvGenerator gen) { try { gen.writeEndArray(); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ShortWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/ShortWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ShortWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/ShortWriteCsvNode.java index 6022cb6ad..473e84b95 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/ShortWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/ShortWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "ShortWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(short value, CsvGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/StringWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/StringWriteCsvNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/StringWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/StringWriteCsvNode.java index 572944425..20f78ccf7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/StringWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/StringWriteCsvNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "StringWriteCsv") @@ -36,7 +36,7 @@ private void doWrite(String value, CsvGenerator gen) { try { gen.writeString(value); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimeWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TimeWriteCsvNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimeWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TimeWriteCsvNode.java index 1e7c4f8e6..5e7893a15 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimeWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TimeWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; import java.io.IOException; import java.time.LocalTime; import java.time.format.DateTimeFormatter; @@ -50,7 +50,7 @@ private void doWrite(TimeObject value, CsvGenerator gen) { gen.writeString(fmtWithoutMS.format(ts)); } } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimestampWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TimestampWriteCsvNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimestampWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TimestampWriteCsvNode.java index 61708bb60..4793bc7f6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TimestampWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TimestampWriteCsvNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -52,7 +52,7 @@ private void doWrite(TimestampObject value, CsvGenerator gen) { gen.writeString(fmtWithoutMS.format(ts)); } } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TryableWriteCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TryableWriteCsvNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TryableWriteCsvNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TryableWriteCsvNode.java index aa3dbaf30..3be081f22 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/csv/writer/internal/TryableWriteCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/internal/TryableWriteCsvNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.csv.writer.internal; import com.fasterxml.jackson.dataformat.csv.CsvGenerator; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; import java.io.IOException; @NodeInfo(shortName = "TryableWriteCsv") @@ -57,7 +57,7 @@ private void doWriteError(String message, CsvGenerator gen) { try { gen.writeString(message); } catch (IOException e) { - throw new CsvWriterRawTruffleException(e.getMessage(), e, this); + throw new CsvWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BinaryReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/BinaryReadJdbcQuery.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BinaryReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/BinaryReadJdbcQuery.java index 782c202f2..195734967 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BinaryReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/BinaryReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "Jdbc.BinaryRead") public class BinaryReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BoolReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/BoolReadJdbcQuery.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BoolReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/BoolReadJdbcQuery.java index 7e6e9f332..ce6f1f22d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/BoolReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/BoolReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.BoolRead") public class BoolReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ByteReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/ByteReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ByteReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/ByteReadJdbcQuery.java index 68dae1f8f..5cc85b99f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ByteReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/ByteReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.ByteRead") public class ByteReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DateReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DateReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DateReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DateReadJdbcQuery.java index 22302cfb2..fe6da9d8d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DateReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DateReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "Jdbc.DateRead") public class DateReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DecimalReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DecimalReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DecimalReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DecimalReadJdbcQuery.java index b6cfecbbf..fa1ece1fb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DecimalReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DecimalReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "Jdbc.DecimalRead") public class DecimalReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DoubleReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DoubleReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DoubleReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DoubleReadJdbcQuery.java index 7a425a645..89b9905d4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/DoubleReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/DoubleReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.DoubleRead") public class DoubleReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/FloatReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/FloatReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/FloatReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/FloatReadJdbcQuery.java index b2a993896..478e309e8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/FloatReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/FloatReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.FloatRead") public class FloatReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/IntReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/IntReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/IntReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/IntReadJdbcQuery.java index 90dc81f99..e19f1b6df 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/IntReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/IntReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.IntRead") public class IntReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/JdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/JdbcQuery.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/JdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/JdbcQuery.java index 906933460..5d0d784a7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/JdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/JdbcQuery.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawException; import com.rawlabs.utils.core.RawSettings; import java.sql.Connection; @@ -54,7 +54,7 @@ public JdbcQuery( } catch (RawException e) { // Exceptions due to location errors (e.g. connection failures) are turned into runtime // exceptions. - throw new JdbcReaderRawTruffleException(e.getMessage(), this, e, null); + throw new JdbcReaderTruffleException(e.getMessage(), this, e, null); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/LongReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/LongReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/LongReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/LongReadJdbcQuery.java index c67d56f70..94cbde047 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/LongReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/LongReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.LongRead") public class LongReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/NullableReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/NullableReadJdbcQuery.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/NullableReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/NullableReadJdbcQuery.java index 9266ff7fd..0ef55fd20 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/NullableReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/NullableReadJdbcQuery.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "NullableReadJdbcQuery") public class NullableReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/RecordReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/RecordReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java index 7be177cd3..ec73e727d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/RecordReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.Arrays; import java.util.List; @@ -34,7 +34,7 @@ public class RecordReadJdbcQuery extends ExpressionNode { private final Rql2AttrType[] columns; - private final RawLanguage language = RawLanguage.get(this); + private final Rql2Language language = Rql2Language.get(this); private final boolean hasDuplicateKeys; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ShortReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/ShortReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ShortReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/ShortReadJdbcQuery.java index 10d622162..d5bc27026 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/ShortReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/ShortReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "Jdbc.ShortRead") public class ShortReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/StringReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/StringReadJdbcQuery.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/StringReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/StringReadJdbcQuery.java index 7096821bd..229c574cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/StringReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/StringReadJdbcQuery.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "StringReadJdbcQuery") public class StringReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimeReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TimeReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimeReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TimeReadJdbcQuery.java index bf7309598..4ad4fa203 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimeReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TimeReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "Time.DateRead") public class TimeReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimestampReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TimestampReadJdbcQuery.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimestampReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TimestampReadJdbcQuery.java index 9319aafc1..01b2aa155 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TimestampReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TimestampReadJdbcQuery.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "Timestamp.DateRead") public class TimestampReadJdbcQuery extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TryableReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TryableReadJdbcQuery.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TryableReadJdbcQuery.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TryableReadJdbcQuery.java index 9287cc5ec..d0742b43a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/jdbc/TryableReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/TryableReadJdbcQuery.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; +package com.rawlabs.snapi.truffle.ast.io.jdbc; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableReadJdbcQuery") public class TryableReadJdbcQuery extends ExpressionNode { @@ -36,7 +36,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcQuery rs = (JdbcQuery) args[0]; try { return innerParse.call(rs, idx); - } catch (RawTruffleRuntimeException e) { + } catch (TruffleRuntimeException e) { return new ErrorObject(e.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParseNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParseNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParseNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParseNode.java index 94f27e6f4..2dcce10e9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParseNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParseNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; +package com.rawlabs.snapi.truffle.ast.io.json.reader; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonReaderTruffleException; @NodeInfo(shortName = "ParseJson") @NodeChild(value = "str") @@ -42,8 +42,8 @@ protected Object doParse( parser = initParserNode.execute(this, str); nextTokenNode.execute(this, parser); return childDirectCall.call(parser); - } catch (RawTruffleRuntimeException e) { - throw new JsonReaderRawTruffleException(e.getMessage(), parser, null, e, this); + } catch (TruffleRuntimeException e) { + throw new JsonReaderTruffleException(e.getMessage(), parser, null, e, this); } finally { if (parser != null) { closeParserNode.execute(this, parser); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParserNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParserNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java index bee8bc7a6..d56eaa06e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonParserNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; +package com.rawlabs.snapi.truffle.ast.io.json.reader; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; @@ -22,17 +22,17 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordStaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonUnexpectedTokenException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.RawArrayList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordStaticInitializers; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonUnexpectedTokenException; +import com.rawlabs.snapi.truffle.runtime.list.TruffleArrayList; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import java.io.IOException; import java.io.Reader; @@ -47,7 +47,7 @@ public final class JsonParserNodes { private static final TruffleLogger LOG = - TruffleLogger.getLogger(RawLanguage.ID, RawTruffleRuntimeException.class); + TruffleLogger.getLogger(Rql2Language.ID, TruffleRuntimeException.class); @NodeInfo(shortName = "JsonParser.Initialize") @GenerateUncached @@ -72,7 +72,7 @@ static JsonParser initParserFromString( parser.enable(JsonReadFeature.ALLOW_NON_NUMERIC_NUMBERS.mappedFeature()); return parser; } catch (IOException e) { - JsonReaderRawTruffleException ex = new JsonReaderRawTruffleException(e, thisNode); + JsonReaderTruffleException ex = new JsonReaderTruffleException(e, thisNode); closeParser.execute(thisNode, parser); throw ex; } @@ -95,8 +95,7 @@ static JsonParser initParserFromStream( parser.enable(JsonReadFeature.ALLOW_NON_NUMERIC_NUMBERS.mappedFeature()); return parser; } catch (IOException e) { - JsonReaderRawTruffleException ex = - new JsonReaderRawTruffleException(parser, stream, e, thisNode); + JsonReaderTruffleException ex = new JsonReaderTruffleException(parser, stream, e, thisNode); closeParser.execute(thisNode, parser); throw ex; } @@ -137,7 +136,7 @@ static void nextToken(Node node, JsonParser parser, @Bind("$node") Node thisNode try { parser.nextToken(); } catch (IOException e) { - throw new JsonReaderRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonReaderTruffleException(e.getMessage(), e, thisNode); } } } @@ -155,7 +154,7 @@ static String getCurrentFieldName(Node node, JsonParser parser, @Bind("$node") N try { return parser.getCurrentName(); } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -191,7 +190,7 @@ static void skip(Node node, JsonParser parser, @Bind("$node") Node thisNode) { parser.nextToken(); // swallow the next token (swallow closing braces, or int, // float, etc.) } catch (IOException e) { - throw new JsonReaderRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonReaderTruffleException(e.getMessage(), e, thisNode); } } } @@ -211,7 +210,7 @@ static BinaryObject doParse(Node node, JsonParser parser, @Bind("$node") Node th parser.nextToken(); return new BinaryObject(Base64.getDecoder().decode(binary)); } catch (IOException | IllegalArgumentException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -231,7 +230,7 @@ static boolean doParse(Node node, JsonParser parser, @Bind("$node") Node thisNod parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -251,7 +250,7 @@ static byte doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode) parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -273,13 +272,13 @@ static DateObject doParse( parser.nextToken(); return date; } catch (DateTimeParseException ex) { - throw new JsonParserRawTruffleException( + throw new JsonParserTruffleException( String.format( "string '%s' does not match date template '%s'", ex.getParsedString(), format), ex, thisNode); } catch (IOException | IllegalArgumentException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -299,7 +298,7 @@ static DecimalObject doParse(Node node, JsonParser parser, @Bind("$node") Node t parser.nextToken(); return new DecimalObject(v); } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -319,7 +318,7 @@ static double doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -339,7 +338,7 @@ static float doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode) parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -364,7 +363,7 @@ static IntervalObject doParse( parser.nextToken(); return interval; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -384,7 +383,7 @@ static int doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode) { parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -404,7 +403,7 @@ static long doParse(JsonParser parser, @Bind("$node") Node thisNode) { parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -424,7 +423,7 @@ static short doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode) parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -441,14 +440,14 @@ public abstract static class ParseStringJsonParserNode extends Node { static String doParse(Node node, JsonParser parser, @Bind("$node") Node thisNode) { try { if (!parser.currentToken().isScalarValue()) { - throw new JsonParserRawTruffleException( + throw new JsonParserTruffleException( "unexpected token: " + parser.currentToken(), thisNode); } String v = parser.getText(); parser.nextToken(); return v; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -470,13 +469,13 @@ static TimeObject doParse( parser.nextToken(); return time; } catch (DateTimeParseException ex) { - throw new JsonParserRawTruffleException( + throw new JsonParserTruffleException( String.format( "string '%s' does not match time template '%s'", ex.getParsedString(), format), ex, thisNode); } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -499,13 +498,13 @@ static TimestampObject doParse( parser.nextToken(); return timestamp; } catch (DateTimeParseException ex) { - throw new JsonParserRawTruffleException( + throw new JsonParserTruffleException( String.format( "string '%s' does not match timestamp template '%s'", ex.getParsedString(), format), ex, thisNode); } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, thisNode); + throw new JsonParserTruffleException(e.getMessage(), e, thisNode); } } } @@ -551,7 +550,7 @@ public boolean isInt(JsonParser parser) { JsonToken token = parser.getCurrentToken(); return token.isNumeric() && parser.getNumberType() == JsonParser.NumberType.INT; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, this); + throw new JsonParserTruffleException(e.getMessage(), e, this); } } @@ -561,7 +560,7 @@ public boolean isLong(JsonParser parser) { JsonToken token = parser.getCurrentToken(); return token.isNumeric() && parser.getNumberType() == JsonParser.NumberType.LONG; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, this); + throw new JsonParserTruffleException(e.getMessage(), e, this); } } @@ -571,7 +570,7 @@ public boolean isFloat(JsonParser parser) { JsonToken token = parser.getCurrentToken(); return token.isNumeric() && parser.getNumberType() == JsonParser.NumberType.FLOAT; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, this); + throw new JsonParserTruffleException(e.getMessage(), e, this); } } @@ -581,7 +580,7 @@ public boolean isDouble(JsonParser parser) { JsonToken token = parser.getCurrentToken(); return token.isNumeric() && parser.getNumberType() == JsonParser.NumberType.DOUBLE; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, this); + throw new JsonParserTruffleException(e.getMessage(), e, this); } } @@ -591,7 +590,7 @@ public boolean isDecimal(JsonParser parser) { JsonToken token = parser.getCurrentToken(); return token.isNumeric() && parser.getNumberType() == JsonParser.NumberType.BIG_DECIMAL; } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, this); + throw new JsonParserTruffleException(e.getMessage(), e, this); } } @@ -602,7 +601,7 @@ public boolean isNull(JsonParser parser) { } @Specialization(guards = {"isArray(parser)"}) - protected static RawArrayList doParseList( + protected static TruffleArrayList doParseList( Node node, JsonParser parser, @Bind("$node") Node thisNode, @@ -626,7 +625,7 @@ protected static RawArrayList doParseList( } nextToken.execute(thisNode, parser); - return new RawArrayList(alist); + return new TruffleArrayList(alist); } @Specialization(guards = {"isObject(parser)"}) @@ -634,7 +633,7 @@ protected static Object doParse( Node node, JsonParser parser, @Bind("$node") Node thisNode, - @Cached("getCachedLanguage(thisNode)") RawLanguage lang, + @Cached("getCachedLanguage(thisNode)") Rql2Language lang, @Cached(inline = false) @Cached.Shared("parseAny") ParseAnyJsonParserNode parse, @Cached @Cached.Shared("nextToken") JsonParserNodes.NextTokenJsonParserNode nextToken, @Cached @Cached.Shared("currentToken") @@ -650,7 +649,7 @@ protected static Object doParse( nextToken.execute(thisNode, parser); - Object record = RawLanguage.get(thisNode).createDuplicateKeyRecord(); + Object record = Rql2Language.get(thisNode).createDuplicateKeyRecord(); while (currentToken.execute(thisNode, parser) != JsonToken.END_OBJECT) { String fieldName = currentField.execute(thisNode, parser); nextToken.execute(thisNode, parser); // skip the field name diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonPrintNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonPrintNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonPrintNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonPrintNode.java index a17030dfa..65ab7d587 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonPrintNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonPrintNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; +package com.rawlabs.snapi.truffle.ast.io.json.reader; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.RootCallTarget; @@ -20,9 +20,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -44,7 +44,7 @@ protected Object doParse( gen.flush(); return stream.toString(); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadCollectionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonReadCollectionNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadCollectionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonReadCollectionNode.java index e03546d78..ebac256ea 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadCollectionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonReadCollectionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; +package com.rawlabs.snapi.truffle.ast.io.json.reader; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.JsonReadCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.JsonReadCollection; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @NodeInfo(shortName = "Json.ReadCollection") public class JsonReadCollectionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadValueNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonReadValueNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadValueNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonReadValueNode.java index c30c889e0..2da56988e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/JsonReadValueNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonReadValueNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; +package com.rawlabs.snapi.truffle.ast.io.json.reader; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.CloseJsonParserNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.InitJsonParserNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes.NextTokenJsonParserNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes.CloseJsonParserNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes.InitJsonParserNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes.NextTokenJsonParserNode; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/TryableTopLevelWrapper.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/TryableTopLevelWrapper.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/TryableTopLevelWrapper.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/TryableTopLevelWrapper.java index ee73a60a5..138815280 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/TryableTopLevelWrapper.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/TryableTopLevelWrapper.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; +package com.rawlabs.snapi.truffle.ast.io.json.reader; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; // This node is a top level wrapper node that catches the Initialization of a child parser failures @NodeInfo(shortName = "TryableParseJsonWrapper") @@ -31,7 +31,7 @@ public TryableTopLevelWrapper(ExpressionNode reader) { public Object executeGeneric(VirtualFrame frame) { try { return reader.executeGeneric(frame); - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/AnyParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/AnyParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/AnyParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/AnyParseJsonNode.java index ef87b2e89..d117c9a48 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/AnyParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/AnyParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "AnyParseJson") public abstract class AnyParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BinaryParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/BinaryParseJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BinaryParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/BinaryParseJsonNode.java index 884f89205..62588bf8d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BinaryParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/BinaryParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "BinaryParseJson") public abstract class BinaryParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BooleanParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/BooleanParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BooleanParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/BooleanParseJsonNode.java index 91b1c5c22..a9d1ee58d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/BooleanParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/BooleanParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "BooleanParseJson") public abstract class BooleanParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ByteParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ByteParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ByteParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ByteParseJsonNode.java index a2cc27bba..2ea12731e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ByteParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ByteParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "ByteParseJson") public abstract class ByteParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/CheckNonNullJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/CheckNonNullJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/CheckNonNullJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/CheckNonNullJsonNode.java index 5de24e4a4..130de5368 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/CheckNonNullJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/CheckNonNullJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonParserTruffleException; @NodeInfo(shortName = "CheckNonNullJson") public class CheckNonNullJsonNode extends ExpressionNode { @@ -40,7 +40,7 @@ public Object executeGeneric(VirtualFrame frame) { @TruffleBoundary private void doCheck(JsonParser parser) { if (parser.currentToken() == JsonToken.VALUE_NULL) { - throw new JsonParserRawTruffleException("null value found", this); + throw new JsonParserTruffleException("null value found", this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DateParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DateParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DateParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DateParseJsonNode.java index de4fa1c4a..96468cbe7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DateParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DateParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "DateParseJson") @NodeChild(value = "format") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DecimalParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DecimalParseJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DecimalParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DecimalParseJsonNode.java index 80433bc6c..1ffdb9b47 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DecimalParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DecimalParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalParseJson") public abstract class DecimalParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DoubleParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DoubleParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DoubleParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DoubleParseJsonNode.java index c24e64351..b7b45acf2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/DoubleParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/DoubleParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "DoubleParseJson") public abstract class DoubleParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/FloatParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/FloatParseJsonNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/FloatParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/FloatParseJsonNode.java index be1143db8..be68a85a7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/FloatParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/FloatParseJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; public abstract class FloatParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IntParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IntParseJsonNode.java index f51682f63..a388ee80e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IntParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "IntParseJson") public abstract class IntParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntervalParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IntervalParseJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntervalParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IntervalParseJsonNode.java index b2ed2177f..d3f4453de 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IntervalParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IntervalParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "IntervalParseJson") public abstract class IntervalParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IterableParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IterableParseJsonNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IterableParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IterableParseJsonNode.java index 4102950e4..f5f5e0c03 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/IterableParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/IterableParseJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; @NodeInfo(shortName = "IterableParseJson") public class IterableParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ListParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ListParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java index 2f47d560e..80fdfc631 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ListParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -20,18 +20,17 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRListParseJsonBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRToArrayBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRIsLessThanSizeConditionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRListParseJsonConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonUnexpectedTokenException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListParseJsonBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRToArrayBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRIsLessThanSizeConditionNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRListParseJsonConditionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonUnexpectedTokenException; import java.util.ArrayList; @NodeInfo(shortName = "IterableParseJson") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/LongParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/LongParseJsonNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/LongParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/LongParseJsonNode.java index eabcc8d4b..1fa00a191 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/LongParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/LongParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "LongParseJson") public abstract class LongParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/NullableParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/NullableParseJsonNode.java similarity index 69% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/NullableParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/NullableParseJsonNode.java index e64aa758f..d85a26cc9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/NullableParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/NullableParseJsonNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonExpectedNothingException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public class NullableParseJsonNode extends ExpressionNode { @@ -50,7 +50,7 @@ public Object executeGeneric(VirtualFrame frame) { try { return childDirectCall.call(parser); } catch (JsonExpectedNothingException ex) { - throw new JsonParserRawTruffleException("expected null but got non-null", ex, this); + throw new JsonParserTruffleException("expected null but got non-null", ex, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/OrParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/OrParseJsonNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/OrParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/OrParseJsonNode.java index 3d3139d93..dd79a1343 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/OrParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/OrParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; @@ -19,14 +19,14 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonOrTypeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonOrTypeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.or.OrObject; import java.io.IOException; public class OrParseJsonNode extends ExpressionNode { @@ -78,7 +78,7 @@ public Object executeGeneric(VirtualFrame frame) { // token. nextTokenNode.execute(this, parser); return new OrObject(i, value); - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { messages[i] = ex.getMessage(); } finally { closeParserNode.execute(this, localParser); @@ -87,7 +87,7 @@ public Object executeGeneric(VirtualFrame frame) { } throw new JsonOrTypeException(messages, this); } catch (IOException e) { - throw new JsonParserRawTruffleException(e.getMessage(), e, this); + throw new JsonParserTruffleException(e.getMessage(), e, this); } finally { closeParserNode.execute(this, localParser); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/RecordParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/RecordParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java index ad7610e38..08ddd85a3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/RecordParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; -import static com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries.*; +import static com.rawlabs.snapi.truffle.ast.TruffleBoundaries.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; @@ -24,22 +24,22 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; -import com.rawlabs.snapi.truffle.runtime.boundary.RawTruffleBoundaries; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonRecordFieldNotFoundException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonUnexpectedTokenException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.TruffleBoundaries; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonRecordFieldNotFoundException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonUnexpectedTokenException; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.BitSet; import java.util.LinkedHashMap; @NodeInfo(shortName = "RecordParseJson") -@ImportStatic(RawTruffleBoundaries.class) +@ImportStatic(TruffleBoundaries.class) public class RecordParseJsonNode extends ExpressionNode { @Children private final DirectCallNode[] childDirectCalls; @@ -67,7 +67,7 @@ public class RecordParseJsonNode extends ExpressionNode { private final int fieldsSize; private final Rql2TypeWithProperties[] fieldTypes; - private final RawLanguage language = RawLanguage.get(this); + private final Rql2Language language = Rql2Language.get(this); private final boolean hasDuplicateKeys; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ShortParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ShortParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ShortParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ShortParseJsonNode.java index 016aca249..68e001de6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/ShortParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ShortParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "ShortParseJson") public abstract class ShortParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/StringParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/StringParseJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/StringParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/StringParseJsonNode.java index 28b5017c6..06fe7b6d2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/StringParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/StringParseJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; @NodeInfo(shortName = "StringParseJson") public abstract class StringParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimeParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TimeParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimeParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TimeParseJsonNode.java index 2c0db02a2..2e353d87f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimeParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TimeParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeParseJson") @NodeChild(value = "format") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimestampParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TimestampParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimestampParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TimestampParseJsonNode.java index 6e0f0a1f0..debb37938 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TimestampParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TimestampParseJsonNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.dsl.Cached; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampParseJson") @NodeChild(value = "format") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TryableParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TryableParseJsonNode.java similarity index 66% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TryableParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TryableParseJsonNode.java index 0b42fdf7d..c7898fe91 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/TryableParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/TryableParseJsonNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseJson") public class TryableParseJsonNode extends ExpressionNode { @@ -42,10 +42,10 @@ public Object executeGeneric(VirtualFrame frame) { JsonParser parser = (JsonParser) args[0]; try { return childDirectCall.call(parser); - } catch (JsonParserRawTruffleException ex) { + } catch (JsonParserTruffleException ex) { try { skipNext.execute(this, parser); - } catch (JsonReaderRawTruffleException e) { + } catch (JsonReaderTruffleException e) { return new ErrorObject(ex.getMessage()); } return new ErrorObject(ex.getMessage()); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/UndefinedParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/UndefinedParseJsonNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/UndefinedParseJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/UndefinedParseJsonNode.java index d6bb6109b..4a3cafe4d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/reader/parser/UndefinedParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/UndefinedParseJsonNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; +package com.rawlabs.snapi.truffle.ast.io.json.reader.parser; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonExpectedNothingException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonExpectedNothingException; public class UndefinedParseJsonNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriteNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/JsonWriteNodes.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriteNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/JsonWriteNodes.java index 8c1f643a3..a09c21a8c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriteNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/JsonWriteNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer; +package com.rawlabs.snapi.truffle.ast.io.json.writer; import com.fasterxml.jackson.core.JsonEncoding; import com.fasterxml.jackson.core.JsonFactory; @@ -21,13 +21,13 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonWriterTruffleException; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.io.IOException; import java.io.OutputStream; import java.time.LocalDateTime; @@ -52,7 +52,7 @@ JsonGenerator createGenerator(Node node, OutputStream os) { jsonFactory.disable(JsonParser.Feature.AUTO_CLOSE_SOURCE); return jsonFactory.createGenerator(os, JsonEncoding.UTF8); } catch (IOException ex) { - throw new RawTruffleRuntimeException(ex, this); + throw new TruffleRuntimeException(ex, this); } } } @@ -70,7 +70,7 @@ void writeStartArray(Node node, JsonGenerator gen) { try { gen.writeStartArray(); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } } @@ -88,7 +88,7 @@ void writeStartArray(JsonGenerator gen) { try { gen.writeEndArray(); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } } @@ -106,7 +106,7 @@ void writeStartObject(JsonGenerator gen) { try { gen.writeStartObject(); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } } @@ -124,7 +124,7 @@ void writeStartObject(Node node, JsonGenerator gen) { try { gen.writeEndObject(); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } } @@ -142,7 +142,7 @@ void writeField(Node node, String fieldName, JsonGenerator gen) { try { gen.writeFieldName(fieldName); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, this); + throw new TruffleRuntimeException(e.getMessage(), e, this); } } } @@ -161,7 +161,7 @@ void doWrite(Node node, BinaryObject value, JsonGenerator gen) { String result = Base64.getEncoder().encodeToString(value.getBytes()); gen.writeString(result); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -179,7 +179,7 @@ void doWrite(Node node, boolean value, JsonGenerator gen) { try { gen.writeBoolean(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -197,7 +197,7 @@ void doWrite(Node node, byte value, JsonGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -215,7 +215,7 @@ void doWrite(Node node, DateObject value, JsonGenerator gen) { try { gen.writeString(value.getDate().toString()); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -233,7 +233,7 @@ void doWrite(Node node, DecimalObject value, JsonGenerator gen) { try { gen.writeNumber(value.getBigDecimal()); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -251,7 +251,7 @@ void doWrite(Node node, double value, JsonGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -269,7 +269,7 @@ void doWrite(Node node, float value, JsonGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -287,7 +287,7 @@ void doWrite(Node node, IntervalObject value, JsonGenerator gen) { try { gen.writeString(value.toString()); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -305,7 +305,7 @@ void doWrite(Node node, int value, JsonGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -323,7 +323,7 @@ void doWrite(Node node, long value, JsonGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -341,7 +341,7 @@ void writeNull(Node node, JsonGenerator gen) { try { gen.writeNull(); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -359,7 +359,7 @@ void doWrite(Node node, short value, JsonGenerator gen) { try { gen.writeNumber(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -377,7 +377,7 @@ void doWrite(Node node, String value, JsonGenerator gen) { try { gen.writeString(value); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -402,7 +402,7 @@ void doWrite(Node node, TimestampObject value, JsonGenerator gen) { // We consider it as an internal error and let it propagate. gen.writeString(fmtWithMS.format(ts)); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } @@ -427,7 +427,7 @@ void doWrite(Node node, TimeObject value, JsonGenerator gen) { // We consider it as an internal error and let it propagate. gen.writeString(fmtWithMS.format(ts)); } catch (IOException e) { - throw new JsonWriterRawTruffleException(e.getMessage(), e, this); + throw new JsonWriterTruffleException(e.getMessage(), e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/JsonWriterNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriterNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/JsonWriterNode.java index 0181ed817..9665ec54c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/JsonWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/JsonWriterNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer; +package com.rawlabs.snapi.truffle.ast.io.json.writer; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.RootCallTarget; @@ -22,10 +22,10 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; import java.io.IOException; import java.io.OutputStream; @@ -47,7 +47,7 @@ public void doWrite( try (JsonGenerator gen = initGeneratorNode.execute(this, outputStream)) { childDirectCall.call(value, gen); } catch (IOException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, thisNode); + throw new TruffleRuntimeException(e.getMessage(), e, thisNode); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/AnyWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/AnyWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/AnyWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/AnyWriteJsonNode.java index b541d9377..1073f344a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/AnyWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/AnyWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "AnyWriteJson") public class AnyWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BinaryWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/BinaryWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BinaryWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/BinaryWriteJsonNode.java index d40e201a3..17c960965 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BinaryWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/BinaryWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.BinaryObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.BinaryObject; @NodeInfo(shortName = "BinaryWriteJson") public class BinaryWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BooleanWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/BooleanWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BooleanWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/BooleanWriteJsonNode.java index 4c312602a..913481b8c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/BooleanWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/BooleanWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "BooleanWriteJson") public class BooleanWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ByteWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ByteWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ByteWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ByteWriteJsonNode.java index 9f1f901fc..17811aacd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ByteWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ByteWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "ByteWriteJson") public class ByteWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DateWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DateWriteJsonNode.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DateWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DateWriteJsonNode.java index ff1e617c2..2df709947 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DateWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DateWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "BooleanWriteJson") public class DateWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DecimalWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DecimalWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DecimalWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DecimalWriteJsonNode.java index 7c9f1433b..8f58f8a35 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DecimalWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DecimalWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalWriteJson") public class DecimalWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DoubleWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DoubleWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DoubleWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DoubleWriteJsonNode.java index bd963a376..c72fa716e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/DoubleWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/DoubleWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "DoubleWriteJson") public class DoubleWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/FloatWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/FloatWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/FloatWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/FloatWriteJsonNode.java index 035eee992..cbd6a0010 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/FloatWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/FloatWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "FloatWriteJson") public class FloatWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IntWriteJsonNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IntWriteJsonNode.java index 37a88af28..c971800fe 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IntWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "IntWriteJson") public class IntWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntervalWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IntervalWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntervalWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IntervalWriteJsonNode.java index 32c8e2b36..ac47a303c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IntervalWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IntervalWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; @NodeInfo(shortName = "IntervalWriteJson") public class IntervalWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IterableWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IterableWriteJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IterableWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IterableWriteJsonNode.java index 7638b1d34..9191cda3c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/IterableWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/IterableWriteJsonNode.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodesFactory; @NodeInfo(shortName = "IterableWriteJson") public class IterableWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ListWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ListWriteJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ListWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ListWriteJsonNode.java index e788acbba..4e2ac36d3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ListWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ListWriteJsonNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; @NodeInfo(shortName = "ListWriteJson") public class ListWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/LongWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/LongWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/LongWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/LongWriteJsonNode.java index 9f4b4aab4..8a8aaa095 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/LongWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/LongWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "LongWriteJson") public class LongWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/NullableWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/NullableWriteJsonNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/NullableWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/NullableWriteJsonNode.java index d6fd36b9d..fe0c09213 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/NullableWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/NullableWriteJsonNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "NullableWriteJson") public class NullableWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/OrWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/OrWriteJsonNode.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/OrWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/OrWriteJsonNode.java index 7e077367a..2796fc16f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/OrWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/OrWriteJsonNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.runtime.or.OrObject; @NodeInfo(shortName = "OrWriteJson") public class OrWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/RecordWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/RecordWriteJsonNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/RecordWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/RecordWriteJsonNode.java index dc9f1490b..854a9d245 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/RecordWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/RecordWriteJsonNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; public class RecordWriteJsonNode extends StatementNode { @@ -71,7 +71,7 @@ public void executeVoid(VirtualFrame frame) { writeEndObjectNode.execute(this, gen); } catch (RuntimeException e) { - throw new RawTruffleInternalErrorException(e, this); + throw new TruffleInternalErrorException(e, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ShortWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ShortWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ShortWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ShortWriteJsonNode.java index 78ad80f64..b41e5769a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/ShortWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/ShortWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "ShortWriteJson") public class ShortWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/StringWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/StringWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/StringWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/StringWriteJsonNode.java index 486a8f303..3b29c5229 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/StringWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/StringWriteJsonNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; @NodeInfo(shortName = "StringWriteJson") public class StringWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimeWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TimeWriteJsonNode.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimeWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TimeWriteJsonNode.java index 5433a5a86..8a515d018 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimeWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TimeWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeWriteJson") public class TimeWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimestampWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TimestampWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimestampWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TimestampWriteJsonNode.java index 51108529f..a6032fe0e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TimestampWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TimestampWriteJsonNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampWriteJson") public class TimestampWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java index 9f4b2c65a..effe21f42 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TryableUnsafeWriteJsonNode.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonWriterRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonWriterTruffleException; @NodeInfo(shortName = "TryableUnsafeWriteJson") public class TryableUnsafeWriteJsonNode extends StatementNode { @@ -47,7 +47,7 @@ public void executeVoid(VirtualFrame frame) { if (!isErrorNode.execute(this, tryable)) { childDirectCall.call(tryable, gen); } else { - throw new JsonWriterRawTruffleException(getFailureNode.execute(this, tryable), this); + throw new JsonWriterTruffleException(getFailureNode.execute(this, tryable), this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TryableWriteJsonNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TryableWriteJsonNode.java index 15d1136fc..9438c3f9e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/TryableWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/TryableWriteJsonNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.fasterxml.jackson.core.JsonGenerator; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.JsonWriteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodes; +import com.rawlabs.snapi.truffle.ast.io.json.writer.JsonWriteNodesFactory; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; @NodeInfo(shortName = "TryableWriteJson") public class TryableWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/UndefinedWriteJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/UndefinedWriteJsonNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/UndefinedWriteJsonNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/UndefinedWriteJsonNode.java index ff743bfd4..e6df907c3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/json/writer/internal/UndefinedWriteJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/writer/internal/UndefinedWriteJsonNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; +package com.rawlabs.snapi.truffle.ast.io.json.writer.internal; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.StatementNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; @NodeInfo(shortName = "UndefinedWriteJson") public class UndefinedWriteJsonNode extends StatementNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoFromNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java index 3034a3eb8..ef5455214 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.kryo; +package com.rawlabs.snapi.truffle.ast.io.kryo; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.frame.VirtualFrame; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodesFactory; import java.io.ByteArrayInputStream; public class KryoFromNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoWriteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoWriteNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java index 0356d34d0..10ee1b40e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/kryo/KryoWriteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.kryo; +package com.rawlabs.snapi.truffle.ast.io.kryo; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.frame.VirtualFrame; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodesFactory; import java.io.ByteArrayOutputStream; public class KryoWriteNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java index 3f9c6422f..19e294fd3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/AttributeParsePrimitiveXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; @NodeInfo(shortName = "AttributeParsePrimitiveXml") public class AttributeParsePrimitiveXmlNode extends ExpressionNode { @@ -29,7 +29,7 @@ public AttributeParsePrimitiveXmlNode(ProgramExpressionNode childProgramStatemen public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; int index = (int) args[1]; String text = parser.getStringAttribute(index); return childDirectCall.call(parser, text); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/BoolParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/BoolParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/BoolParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/BoolParseXmlNode.java index 2d7284b9a..01e8ff6ec 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/BoolParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/BoolParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "BoolParseXml") public abstract class BoolParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class BoolParseXmlNode extends ExpressionNode { @Specialization public boolean parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.boolFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ByteParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ByteParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ByteParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ByteParseXmlNode.java index 80644b01e..6b545b316 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ByteParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ByteParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "ByteParseXml") public abstract class ByteParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class ByteParseXmlNode extends ExpressionNode { @Specialization public byte parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.byteFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DateParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DateParseXmlNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DateParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DateParseXmlNode.java index f5930e075..caa1b16ed 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DateParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DateParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; @NodeInfo(shortName = "DateParseXml") public abstract class DateParseXmlNode extends ExpressionNode { @@ -24,7 +24,7 @@ public abstract class DateParseXmlNode extends ExpressionNode { @Specialization public DateObject parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.dateFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DecimalParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DecimalParseXmlNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DecimalParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DecimalParseXmlNode.java index 6bca17af7..c7c3e60d8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DecimalParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DecimalParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @NodeInfo(shortName = "DecimalParseXml") public abstract class DecimalParseXmlNode extends ExpressionNode { @@ -24,7 +24,7 @@ public abstract class DecimalParseXmlNode extends ExpressionNode { @Specialization public DecimalObject parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.decimalFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DoubleParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DoubleParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DoubleParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DoubleParseXmlNode.java index 5337a56ba..56d0a6b2d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/DoubleParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/DoubleParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "DoubleParseXml") public abstract class DoubleParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class DoubleParseXmlNode extends ExpressionNode { @Specialization public double parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.doubleFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java index 2e04a2ad0..23f0e8f2e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ElementParseXmlPrimitiveNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; @NodeInfo(shortName = "ElementParseXml") public class ElementParseXmlPrimitiveNode extends ExpressionNode { @@ -29,7 +29,7 @@ public ElementParseXmlPrimitiveNode(ProgramExpressionNode childProgramStatementN public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String text = parser.getAsString(); Object value = childDirectCall.call(parser, text); parser.nextToken(); // Skip the end element diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/FloatParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/FloatParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/FloatParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/FloatParseXmlNode.java index b883018cc..0fee8646f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/FloatParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/FloatParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "FloatParseXml") public abstract class FloatParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class FloatParseXmlNode extends ExpressionNode { @Specialization public float parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.floatFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IntParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/IntParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IntParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/IntParseXmlNode.java index 008b48e96..70a220808 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IntParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/IntParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "IntParseXml") public abstract class IntParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class IntParseXmlNode extends ExpressionNode { @Specialization public int parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.intFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IterableParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/IterableParseXmlNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IterableParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/IterableParseXmlNode.java index d9756ee76..8b3c61fd8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/IterableParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/IterableParseXmlNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; @NodeInfo(shortName = "IterableParseXml") public class IterableParseXmlNode extends ExpressionNode { @@ -34,7 +34,7 @@ public IterableParseXmlNode(ProgramExpressionNode childProgramStatementNode) { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; Object list = this.childDirectCall.call(parser); return toIterableNode.execute(this, list); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/LongParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/LongParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/LongParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/LongParseXmlNode.java index c4d7d0d54..80075533e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/LongParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/LongParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "LongParseXml") public abstract class LongParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class LongParseXmlNode extends ExpressionNode { @Specialization public long parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.longFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/NullableParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/NullableParseXmlNode.java similarity index 66% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/NullableParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/NullableParseXmlNode.java index ef705a11c..b735c6f79 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/NullableParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/NullableParseXmlNode.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonExpectedNothingException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonExpectedNothingException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public class NullableParseXmlNode extends ExpressionNode { @@ -46,7 +46,7 @@ public Object executeGeneric(VirtualFrame frame) { try { return childDirectCall.call(parser); } catch (JsonExpectedNothingException ex) { - throw new JsonParserRawTruffleException("expected null but got non-null", ex, this); + throw new JsonParserTruffleException("expected null but got non-null", ex, this); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OptionParseXmlTextNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/OptionParseXmlTextNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OptionParseXmlTextNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/OptionParseXmlTextNode.java index 893e863dd..530c3e05c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OptionParseXmlTextNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/OptionParseXmlTextNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; @NodeInfo(shortName = "OptionParseXmlText") public class OptionParseXmlTextNode extends ExpressionNode { @@ -30,7 +30,7 @@ public OptionParseXmlTextNode(ProgramExpressionNode childProgramStatementNode) { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String text = (String) args[1]; if (text.isEmpty()) { return NullObject.INSTANCE; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OrTypeParseXml.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/OrTypeParseXml.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OrTypeParseXml.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/OrTypeParseXml.java index 550146dfa..0e9dc8ace 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/OrTypeParseXml.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/OrTypeParseXml.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlOrTypeParserException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.or.OrObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlOrTypeParserException; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.or.OrObject; import java.util.ArrayList; @NodeInfo(shortName = "OrTypeParseXml") @@ -38,12 +38,12 @@ public OrTypeParseXml(ProgramExpressionNode[] options) { @ExplodeLoop public OrObject executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String text = parser.elementAsString(); ArrayList parseErrors = new ArrayList<>(); for (int i = 0; i < options.length; i++) { DirectCallNode option = options[i]; - RawTruffleXmlParser optionParser = parser.duplicateFor(text); + TruffleXmlParser optionParser = parser.duplicateFor(text); try { optionParser.nextToken(); optionParser.assertCurrentTokenIsStartTag(); @@ -52,7 +52,7 @@ public OrObject executeGeneric(VirtualFrame frame) { parser.expectEndTag(null); parser.nextToken(); // skip end tag return new OrObject(i, value); - } catch (XmlParserRawTruffleException e) { + } catch (XmlParserTruffleException e) { String error = e.getMessage(); parseErrors.add(error); optionParser.close(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RecordParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RecordParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java index dbcd7fcd8..cc8bd8d46 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RecordParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; -import static com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordStaticInitializers.hasDuplicateKeys; +import static com.rawlabs.snapi.truffle.ast.expressions.record.RecordStaticInitializers.hasDuplicateKeys; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; @@ -20,14 +20,14 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.*; @NodeInfo(shortName = "RecordParseXml") @@ -49,7 +49,7 @@ public class RecordParseXmlNode extends ExpressionNode { private final BitSet bitSet; private final boolean hasDuplicateKeys; - private final RawLanguage language = RawLanguage.get(this); + private final Rql2Language language = Rql2Language.get(this); public RecordParseXmlNode( ProgramExpressionNode[] childProgramExpressionNode, @@ -86,12 +86,12 @@ public RecordParseXmlNode( public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; return doExecute(parser); } @TruffleBoundary - private Object doExecute(RawTruffleXmlParser parser) { + private Object doExecute(TruffleXmlParser parser) { for (String fieldName : collectionsIndex.keySet()) { // set collections/lists to empty ones collectionValues.put(fieldName, new ArrayList<>()); @@ -182,7 +182,7 @@ record = language.createPureRecord(); // if there are missing fields, throw an exception with all the missing fields if (missingFields.length() != 0) { String missingFieldsStr = missingFields.substring(2); - throw new XmlParserRawTruffleException("fields not found: " + missingFieldsStr, parser, this); + throw new XmlParserTruffleException("fields not found: " + missingFieldsStr, parser, this); } // Skipping the END_OBJECT token here after checking if everything is ok. // Because if there is an exception TryableParseXmlNode will skip the current object @@ -195,7 +195,7 @@ private String[] getKeySet() { return collectionValues.keySet().toArray(new String[0]); } - private void parseTagContent(RawTruffleXmlParser parser, String fieldName, Object record) { + private void parseTagContent(TruffleXmlParser parser, String fieldName, Object record) { Integer index = fieldsIndex.get(fieldName); if (index != null) { applyParser(parser, index, fieldName, record); @@ -205,7 +205,7 @@ private void parseTagContent(RawTruffleXmlParser parser, String fieldName, Objec } } - private void applyParser(RawTruffleXmlParser parser, int index, String fieldName, Object record) { + private void applyParser(TruffleXmlParser parser, int index, String fieldName, Object record) { Object value = childDirectCalls[index].call(parser); storeFieldValue(fieldName, index, value, record); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ShortParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ShortParseXmlNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ShortParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ShortParseXmlNode.java index 6ebbd2438..375f1e625 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/ShortParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/ShortParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "ShortParseXml") public abstract class ShortParseXmlNode extends ExpressionNode { @@ -23,7 +23,7 @@ public abstract class ShortParseXmlNode extends ExpressionNode { @Specialization public short parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.shortFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/StringParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/StringParseXmlNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/StringParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/StringParseXmlNode.java index baa2fb8db..1aebd18a8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/StringParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/StringParseXmlNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; @NodeInfo(shortName = "StringParseXml") public abstract class StringParseXmlNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TextParseXmlPrimitiveNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TextParseXmlPrimitiveNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TextParseXmlPrimitiveNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TextParseXmlPrimitiveNode.java index 71bbd2e48..045899699 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TextParseXmlPrimitiveNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TextParseXmlPrimitiveNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; @NodeInfo(shortName = "TextParseXml") public class TextParseXmlPrimitiveNode extends ExpressionNode { @@ -29,7 +29,7 @@ public TextParseXmlPrimitiveNode(ProgramExpressionNode childProgramStatementNode public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String text = parser.getText(); return childDirectCall.call(parser, text); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimeParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TimeParseXmlNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimeParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TimeParseXmlNode.java index 1a1c00f0c..618088e03 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimeParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TimeParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; @NodeInfo(shortName = "TimeParseXml") public abstract class TimeParseXmlNode extends ExpressionNode { @@ -24,7 +24,7 @@ public abstract class TimeParseXmlNode extends ExpressionNode { @Specialization public TimeObject parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.timeFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimestampParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TimestampParseXmlNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimestampParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TimestampParseXmlNode.java index dc94f8de9..1af103a13 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TimestampParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TimestampParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @NodeInfo(shortName = "TimestampParseXml") public abstract class TimestampParseXmlNode extends ExpressionNode { @@ -24,7 +24,7 @@ public abstract class TimestampParseXmlNode extends ExpressionNode { @Specialization public TimestampObject parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; return parser.timestampFrom(value); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParser.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParser.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParser.java index e3b3efe5d..dcb62a973 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParser.java @@ -10,19 +10,19 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.DateTimeFormatCache; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DateObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.DecimalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimeObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.DateObject; +import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimeObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleStringCharStream; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -36,17 +36,17 @@ import javax.xml.stream.XMLStreamReader; import org.apache.commons.text.StringEscapeUtils; -public class RawTruffleXmlParser { +public class TruffleXmlParser { private int currentLine; private int currentColumn; private final XMLStreamReader xmlStreamReader; - private final RawTruffleCharStream stream; + private final TruffleCharStream stream; private int currentToken; private String currentTag; private boolean currentTokenValid = false; private final DateTimeFormatter dateFormatter, timeFormatter, timestampFormatter; - private final RawTruffleXmlParserSettings settings; + private final TruffleXmlParserSettings settings; @TruffleBoundary public int currentLine() { @@ -59,7 +59,7 @@ public int currentColumn() { } @TruffleBoundary - public RawTruffleXmlParser(RawTruffleCharStream stream, RawTruffleXmlParserSettings settings) { + public TruffleXmlParser(TruffleCharStream stream, TruffleXmlParserSettings settings) { this.stream = stream; this.dateFormatter = DateTimeFormatCache.get(settings.dateFormat); this.timeFormatter = DateTimeFormatCache.get(settings.timeFormat); @@ -67,23 +67,23 @@ public RawTruffleXmlParser(RawTruffleCharStream stream, RawTruffleXmlParserSetti this.settings = settings; try { xmlStreamReader = - RawTruffleXmlParserFactory.singleton().createXMLStreamReader(stream.getReader()); + TruffleXmlParserFactory.singleton().createXMLStreamReader(stream.getReader()); } catch (XMLStreamException e) { // TODO !!!!!!!!!!!!!!!!!!!!! Like in CSV/Json - throw new XmlReaderRawTruffleException("Error creating XMLStreamReader", e, null); + throw new XmlReaderTruffleException("Error creating XMLStreamReader", e, null); } } private final StringBuilder stringBuilder = new StringBuilder(); - public static RawTruffleXmlParser create( - RawTruffleCharStream stream, RawTruffleXmlParserSettings settings) { - return new RawTruffleXmlParser(stream, settings); + public static TruffleXmlParser create( + TruffleCharStream stream, TruffleXmlParserSettings settings) { + return new TruffleXmlParser(stream, settings); } - public RawTruffleXmlParser duplicateFor(String text) { - RawTruffleCharStream subStream = new RawTruffleStringCharStream(text); - return new RawTruffleXmlParser(subStream, settings); + public TruffleXmlParser duplicateFor(String text) { + TruffleCharStream subStream = new TruffleStringCharStream(text); + return new TruffleXmlParser(subStream, settings); } @TruffleBoundary @@ -96,7 +96,7 @@ public void expectEndTag(String tag) { int currentToken = xmlStreamReader.getEventType(); if (currentToken != XMLStreamReader.END_ELEMENT) { recordPosition(); - throw new XmlParserRawTruffleException( + throw new XmlParserTruffleException( "expected " + eventToStr(XMLStreamReader.END_ELEMENT, tag) + " but got " @@ -130,7 +130,7 @@ private String eventToStr(int token, String tagName) { return "attribute"; default: // TODO log something - throw new RawTruffleInternalErrorException(); + throw new TruffleInternalErrorException(); } } @@ -140,7 +140,7 @@ public boolean onEndTag() { assert (currentTokenValid || !xmlStreamReader.hasNext()); return currentToken == XMLStreamReader.END_ELEMENT; } catch (IllegalStateException | XMLStreamException ex) { - throw new XmlReaderRawTruffleException(ex, stream, null); + throw new XmlReaderTruffleException(ex, stream, null); } } @@ -168,7 +168,7 @@ public void skipTag() { if (depth == 0) break; } } catch (XMLStreamException ex) { - throw new XmlParserRawTruffleException(ex, this); + throw new XmlParserTruffleException(ex, this); } } @@ -184,7 +184,7 @@ public void finishConsuming() { if (depth == 0) break; } } catch (XMLStreamException ex) { - throw new XmlReaderRawTruffleException(ex, stream, null); + throw new XmlReaderTruffleException(ex, stream, null); } } @@ -198,7 +198,7 @@ public Vector attributes() { } return names; } catch (IllegalStateException ex) { - throw new XmlReaderRawTruffleException(ex, stream, null); + throw new XmlReaderTruffleException(ex, stream, null); } } @@ -227,7 +227,7 @@ public int nextToken() { } catch (XMLStreamException e) { // TODO more details? recordPosition(); - throw new XmlReaderRawTruffleException(e, this, stream, null); + throw new XmlReaderTruffleException(e, this, stream, null); } return currentToken; } @@ -237,7 +237,7 @@ private void assertCurrentToken(int expectedToken) { if (currentToken != expectedToken) { // TODO !!!!!!!!!!!!!!!!!!!!!!!!!! recordPosition(); - throw new XmlReaderRawTruffleException( + throw new XmlReaderTruffleException( "Expected token " + expectedToken + " but found " + currentToken, stream, null); } } @@ -284,8 +284,7 @@ public byte byteFrom(String content) { try { return Byte.parseByte(content.strip()); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException( - "cannot cast '" + content + "' to byte", this, e, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to byte", this, e, null); } } @@ -294,8 +293,7 @@ public short shortFrom(String content) { try { return Short.parseShort(content.strip()); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException( - "cannot cast '" + content + "' to short", this, e, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to short", this, e, null); } } @@ -304,7 +302,7 @@ public int intFrom(String content) { try { return Integer.parseInt(content.strip()); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException("cannot cast '" + content + "' to int", this, e, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to int", this, e, null); } } @@ -313,8 +311,7 @@ public long longFrom(String content) { try { return Long.parseLong(content.strip()); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException( - "cannot cast '" + content + "' to long", this, e, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to long", this, e, null); } } @@ -323,8 +320,7 @@ public float floatFrom(String content) { try { return Float.parseFloat(content.strip()); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException( - "cannot cast '" + content + "' to float", this, e, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to float", this, e, null); } } @@ -333,8 +329,7 @@ public double doubleFrom(String content) { try { return Double.parseDouble(content.strip()); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException( - "cannot cast '" + content + "' to double", this, e, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to double", this, e, null); } } @@ -343,7 +338,7 @@ public DecimalObject decimalFrom(String content) { try { return new DecimalObject(new BigDecimal(content.strip())); } catch (NumberFormatException e) { - throw new XmlParserRawTruffleException( + throw new XmlParserTruffleException( "cannot cast '" + content + "' to decimal", this, e, null); } } @@ -356,8 +351,7 @@ public boolean boolFrom(String content) { } else if (Objects.equals(normalized, "false")) { return false; } else { - throw new XmlParserRawTruffleException( - "cannot cast '" + content + "' to boolean", this, null); + throw new XmlParserTruffleException("cannot cast '" + content + "' to boolean", this, null); } } @@ -366,7 +360,7 @@ public DateObject dateFrom(String content) { try { return new DateObject(LocalDate.parse(content.strip(), dateFormatter)); } catch (DateTimeParseException ex) { - throw new XmlParserRawTruffleException( + throw new XmlParserTruffleException( String.format( "string '%s' does not match date template '%s'", content, settings.dateFormat), this, @@ -380,7 +374,7 @@ public TimeObject timeFrom(String content) { try { return new TimeObject(LocalTime.parse(content.strip(), timeFormatter)); } catch (DateTimeParseException ex) { - throw new XmlParserRawTruffleException( + throw new XmlParserTruffleException( String.format( "string '%s' does not match time template '%s'", content, settings.timeFormat), this, @@ -394,7 +388,7 @@ public TimestampObject timestampFrom(String content) { try { return new TimestampObject(LocalDateTime.parse(content.strip(), timestampFormatter)); } catch (DateTimeParseException ex) { - throw new XmlParserRawTruffleException( + throw new XmlParserTruffleException( String.format( "string '%s' does not match timestamp template '%s'", content, settings.timestampFormat), @@ -410,7 +404,7 @@ public void close() { xmlStreamReader.close(); } catch (XMLStreamException e) { // TODO !!!!!!!!!!!!!!!!!!!!! Like in CSV/Json - throw new XmlReaderRawTruffleException("Error closing XMLStreamReader", e, null); + throw new XmlReaderTruffleException("Error closing XMLStreamReader", e, null); } } @@ -465,7 +459,7 @@ public String elementAsString() { } } } catch (XMLStreamException e) { - throw new XmlParserRawTruffleException(e, this); + throw new XmlParserTruffleException(e, this); } return s.toString(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParserFactory.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParserFactory.java index 546346354..920695386 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserFactory.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParserFactory.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.ctc.wstx.api.WstxInputProperties; import com.ctc.wstx.stax.WstxInputFactory; @@ -18,10 +18,10 @@ import javax.xml.stream.XMLInputFactory; import org.codehaus.stax2.XMLInputFactory2; -public class RawTruffleXmlParserFactory extends WstxInputFactory { +public class TruffleXmlParserFactory extends WstxInputFactory { @TruffleBoundary - public RawTruffleXmlParserFactory() { + public TruffleXmlParserFactory() { super(); setProperty( WstxInputProperties.P_INPUT_PARSING_MODE, WstxInputProperties.PARSING_MODE_DOCUMENTS); @@ -29,11 +29,11 @@ public RawTruffleXmlParserFactory() { setProperty(XMLInputFactory.SUPPORT_DTD, false); } - private static RawTruffleXmlParserFactory singleton = null; + private static TruffleXmlParserFactory singleton = null; - public static RawTruffleXmlParserFactory singleton() { + public static TruffleXmlParserFactory singleton() { if (singleton == null) { - singleton = new RawTruffleXmlParserFactory(); + singleton = new TruffleXmlParserFactory(); } return singleton; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParserSettings.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParserSettings.java index f5de300df..b3b9cc806 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/RawTruffleXmlParserSettings.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TruffleXmlParserSettings.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; -public class RawTruffleXmlParserSettings { +public class TruffleXmlParserSettings { protected final String dateFormat; protected final String timeFormat; protected final String timestampFormat; - public RawTruffleXmlParserSettings(String dateFormat, String timeFormat, String timestampFormat) { + public TruffleXmlParserSettings(String dateFormat, String timeFormat, String timestampFormat) { this.dateFormat = dateFormat; this.timeFormat = timeFormat; this.timestampFormat = timestampFormat; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseAttributeXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TryableParseAttributeXmlNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseAttributeXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TryableParseAttributeXmlNode.java index bfa3a1d39..82284096f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseAttributeXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TryableParseAttributeXmlNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseAttributeXml") public class TryableParseAttributeXmlNode extends ExpressionNode { @@ -33,7 +33,7 @@ public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); try { return childDirectCall.call(args); - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { return new ErrorObject(ex.getMessage()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TryableParseXmlNode.java similarity index 69% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TryableParseXmlNode.java index 681c5404c..349f5eb87 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/TryableParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/TryableParseXmlNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @NodeInfo(shortName = "TryableParseXml") public class TryableParseXmlNode extends ExpressionNode { @@ -31,14 +31,14 @@ public TryableParseXmlNode(ProgramExpressionNode childProgramStatementNode) { public Object executeGeneric(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; try { return childDirectCall.call(args); - } catch (XmlParserRawTruffleException ex) { + } catch (XmlParserTruffleException ex) { Object failure = new ErrorObject(ex.getMessage()); try { parser.finishConsuming(); - } catch (XmlParserRawTruffleException e) { + } catch (XmlParserTruffleException e) { return failure; } return failure; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/UndefinedParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/UndefinedParseXmlNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/UndefinedParseXmlNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/UndefinedParseXmlNode.java index ac58e4cf5..610079a43 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/UndefinedParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/UndefinedParseXmlNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlExpectedNothingException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlExpectedNothingException; @NodeInfo(shortName = "UndefinedParseXml") public abstract class UndefinedParseXmlNode extends ExpressionNode { @@ -24,7 +24,7 @@ public abstract class UndefinedParseXmlNode extends ExpressionNode { @Specialization public byte parse(VirtualFrame frame) { Object[] args = frame.getArguments(); - RawTruffleXmlParser parser = (RawTruffleXmlParser) args[0]; + TruffleXmlParser parser = (TruffleXmlParser) args[0]; String value = (String) args[1]; throw new XmlExpectedNothingException(value, parser, this); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseCollectionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlParseCollectionNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseCollectionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlParseCollectionNode.java index 6adeb22b0..1c6fb5aa1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseCollectionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlParseCollectionNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.XmlParseCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.XmlParseCollection; @NodeInfo(shortName = "XmlParseCollection") public class XmlParseCollectionNode extends ExpressionNode { @@ -47,8 +47,8 @@ public Object executeGeneric(VirtualFrame virtualFrame) { String dateFormat = (String) dateFormatExp.executeGeneric(virtualFrame); String timeFormat = (String) timeFormatExp.executeGeneric(virtualFrame); String datetimeFormat = (String) datetimeFormatExp.executeGeneric(virtualFrame); - RawTruffleXmlParserSettings settings = - new RawTruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); + TruffleXmlParserSettings settings = + new TruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); return new XmlParseCollection(text, parseNextRootCallTarget, settings); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseValueNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlParseValueNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseValueNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlParseValueNode.java index e555460c1..05f1e4da0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlParseValueNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlParseValueNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleStringCharStream; @NodeInfo(shortName = "XmlParseValue") public class XmlParseValueNode extends ExpressionNode { @@ -29,7 +29,7 @@ public class XmlParseValueNode extends ExpressionNode { @Child private ExpressionNode timeFormatExp; @Child private ExpressionNode datetimeFormatExp; - private RawTruffleXmlParser parser; + private TruffleXmlParser parser; public XmlParseValueNode( ExpressionNode stringExp, @@ -48,15 +48,15 @@ public XmlParseValueNode( public Object executeGeneric(VirtualFrame virtualFrame) { try { String string = (String) stringExp.executeGeneric(virtualFrame); - RawTruffleStringCharStream stream = new RawTruffleStringCharStream(string); + TruffleStringCharStream stream = new TruffleStringCharStream(string); String dateFormat = (String) dateFormatExp.executeGeneric(virtualFrame); String timeFormat = (String) timeFormatExp.executeGeneric(virtualFrame); String datetimeFormat = (String) datetimeFormatExp.executeGeneric(virtualFrame); - RawTruffleXmlParserSettings settings = - new RawTruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); + TruffleXmlParserSettings settings = + new TruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); - parser = RawTruffleXmlParser.create(stream, settings); + parser = TruffleXmlParser.create(stream, settings); parser.nextToken(); // consume START_OBJECT parser.assertCurrentTokenIsStartTag(); // because it's the top level object return this.childDirectCall.call(parser); // ... and we start to parse it. diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadCollectionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlReadCollectionNode.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadCollectionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlReadCollectionNode.java index b488e83b4..3f3a175ed 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadCollectionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlReadCollectionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.XmlReadCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.XmlReadCollection; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @NodeInfo(shortName = "XmlReadCollection") public class XmlReadCollectionNode extends ExpressionNode { @@ -52,8 +52,8 @@ public Object executeGeneric(VirtualFrame virtualFrame) { String dateFormat = (String) dateFormatExp.executeGeneric(virtualFrame); String timeFormat = (String) timeFormatExp.executeGeneric(virtualFrame); String datetimeFormat = (String) datetimeFormatExp.executeGeneric(virtualFrame); - RawTruffleXmlParserSettings settings = - new RawTruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); + TruffleXmlParserSettings settings = + new TruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); return new XmlReadCollection(locationObject, encoding, parseRootCallTarget, settings); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadValueNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlReadValueNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadValueNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlReadValueNode.java index 06c1e5130..739308b72 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/io/xml/parser/XmlReadValueNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/XmlReadValueNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; +package com.rawlabs.snapi.truffle.ast.io.xml.parser; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; @@ -52,7 +52,7 @@ public XmlReadValueNode( @Override public Object executeGeneric(VirtualFrame virtualFrame) { - RawTruffleXmlParser parser = null; + TruffleXmlParser parser = null; try { LocationObject locationObject = (LocationObject) locationExp.executeGeneric(virtualFrame); String encoding = (String) encodingExp.executeGeneric(virtualFrame); @@ -61,16 +61,16 @@ public Object executeGeneric(VirtualFrame virtualFrame) { String dateFormat = (String) dateFormatExp.executeGeneric(virtualFrame); String timeFormat = (String) timeFormatExp.executeGeneric(virtualFrame); String datetimeFormat = (String) datetimeFormatExp.executeGeneric(virtualFrame); - RawTruffleXmlParserSettings settings = - new RawTruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); + TruffleXmlParserSettings settings = + new TruffleXmlParserSettings(dateFormat, timeFormat, datetimeFormat); try { - parser = RawTruffleXmlParser.create(stream, settings); + parser = TruffleXmlParser.create(stream, settings); parser.nextToken(); // consume START_OBJECT parser.assertCurrentTokenIsStartTag(); // because it's the top level object return this.childDirectCall.call(parser); // ... and we start to parse it. - } catch (XmlParserRawTruffleException e) { - throw new XmlReaderRawTruffleException(e, stream, this); + } catch (XmlParserTruffleException e) { + throw new XmlReaderTruffleException(e, stream, this); } } finally { if (parser != null) parser.close(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadClosureVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadClosureVariableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java index 32d42fc1a..e37da7c11 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadClosureVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.local; +package com.rawlabs.snapi.truffle.ast.local; import com.oracle.truffle.api.TruffleLogger; import com.oracle.truffle.api.dsl.Idempotent; @@ -21,10 +21,10 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; @ImportStatic(TypeGuards.class) @NodeField(name = "depth", type = Integer.class) @@ -33,7 +33,7 @@ public abstract class ReadClosureVariableNode extends ExpressionNode { private static final TruffleLogger LOG = - TruffleLogger.getLogger(RawLanguage.ID, RawTruffleRuntimeException.class); + TruffleLogger.getLogger(Rql2Language.ID, TruffleRuntimeException.class); @Idempotent protected abstract Integer getDepth(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadLocalVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadLocalVariableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java index 8c2be93de..ae2b78036 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadLocalVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.local; +package com.rawlabs.snapi.truffle.ast.local; import com.oracle.truffle.api.dsl.Idempotent; import com.oracle.truffle.api.dsl.ImportStatic; @@ -18,8 +18,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; @ImportStatic(TypeGuards.class) @NodeField(name = "slot", type = int.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamClosureNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadParamClosureNode.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamClosureNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadParamClosureNode.java index b8856fbe4..bc1855347 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamClosureNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadParamClosureNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.local; +package com.rawlabs.snapi.truffle.ast.local; import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class ReadParamClosureNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadParamNode.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadParamNode.java index 55b64282f..65f42e7d2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/ReadParamNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadParamNode.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.local; +package com.rawlabs.snapi.truffle.ast.local; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class ReadParamNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/WriteLocalVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/WriteLocalVariableNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java index caccca11b..edb7b7069 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/local/WriteLocalVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.local; +package com.rawlabs.snapi.truffle.ast.local; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.VirtualFrame; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; @ImportStatic(TypeGuards.class) @NodeChild("value") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/OSRGeneratorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/OSRGeneratorNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/OSRGeneratorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/OSRGeneratorNode.java index 4ddf67e39..b2466e42b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/OSRGeneratorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/OSRGeneratorNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr; +package com.rawlabs.snapi.truffle.ast.osr; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.RepeatingNode; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; public class OSRGeneratorNode extends Node implements RepeatingNode { @@ -38,7 +38,7 @@ public boolean executeRepeating(VirtualFrame frame) { } return false; } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException(e); + throw new TruffleInternalErrorException(e); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java index 80878727b..3d6243aa8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionEquiJoinInitBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; public class OSRCollectionEquiJoinInitBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionFilterBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionFilterBodyNode.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionFilterBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionFilterBodyNode.java index a8068f186..0cb8968f4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionFilterBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionFilterBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRCollectionFilterBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java index 96d0523f4..fc6dab5cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionJoinInitBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodesFactory; public class OSRCollectionJoinInitBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionMkStringBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionMkStringBodyNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionMkStringBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionMkStringBodyNode.java index eb15141f5..5f0bf452e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRCollectionMkStringBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRCollectionMkStringBodyNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; public class OSRCollectionMkStringBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRDistinctGetGeneratorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRDistinctGetGeneratorNode.java similarity index 68% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRDistinctGetGeneratorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRDistinctGetGeneratorNode.java index 722ec1d1f..017b1c6ff 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRDistinctGetGeneratorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRDistinctGetGeneratorNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; public class OSRDistinctGetGeneratorNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSREquiJoinNextBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSREquiJoinNextBodyNode.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSREquiJoinNextBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSREquiJoinNextBodyNode.java index c75681a3e..e89cd5709 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSREquiJoinNextBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSREquiJoinNextBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory; public class OSREquiJoinNextBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRExistsBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRExistsBodyNode.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRExistsBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRExistsBodyNode.java index 6b0138733..74c9117bd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRExistsBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRExistsBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRExistsBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRJoinNextBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRJoinNextBodyNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRJoinNextBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRJoinNextBodyNode.java index e08f61d89..16e1c5fc9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRJoinNextBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRJoinNextBodyNode.java @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodesFactory; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -71,7 +71,7 @@ private Input createInput(File file, Node node) { try { return new Input(new FileInputStream(file)); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, node); + throw new TruffleRuntimeException(e.getMessage(), e, node); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java index 4fbf41bb3..b3de1a4f2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListEquiJoinInitBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; public class OSRListEquiJoinInitBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFilterBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListFilterBodyNode.java similarity index 75% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFilterBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListFilterBodyNode.java index 889da52c6..c3394b996 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFilterBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListFilterBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; import java.util.ArrayList; public class OSRListFilterBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFromBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListFromBodyNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFromBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListFromBodyNode.java index fadd72a9f..14ce33d42 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListFromBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListFromBodyNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; import java.util.ArrayList; public class OSRListFromBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListParseJsonBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListParseJsonBodyNode.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListParseJsonBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListParseJsonBodyNode.java index d734960b1..ef4f21a7f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListParseJsonBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListParseJsonBodyNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.ArrayList; public class OSRListParseJsonBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListTransformBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListTransformBodyNode.java similarity index 76% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListTransformBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListTransformBodyNode.java index 7da74cfb4..00879a242 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRListTransformBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRListTransformBodyNode.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.ArrayOperationNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodesFactory; public class OSRListTransformBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRMultiAggregationBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRMultiAggregationBodyNode.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRMultiAggregationBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRMultiAggregationBodyNode.java index f3f3c9dd9..acdbb54e1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRMultiAggregationBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRMultiAggregationBodyNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregatorNodes; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRMultiAggregationBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSROrderByGetGeneratorNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSROrderByGetGeneratorNode.java similarity index 69% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSROrderByGetGeneratorNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSROrderByGetGeneratorNode.java index 5190bc4c8..0fea938de 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSROrderByGetGeneratorNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSROrderByGetGeneratorNode.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.OrderByCollection; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.OrderByCollection; public class OSROrderByGetGeneratorNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRSingleAggregationBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRSingleAggregationBodyNode.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRSingleAggregationBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRSingleAggregationBodyNode.java index 19935adb2..6f29dfdec 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRSingleAggregationBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRSingleAggregationBodyNode.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodes; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregatorNodesFactory; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregatorNodes; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregatorNodesFactory; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRSingleAggregationBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRToArrayBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRToArrayBodyNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java index dbe9fd1ff..5a1761e32 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/bodies/OSRToArrayBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; +package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.TypeGuards; import java.util.ArrayList; public class OSRToArrayBodyNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRCollectionFilterConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRCollectionFilterConditionNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRCollectionFilterConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRCollectionFilterConditionNode.java index 65bfc17de..e7df49036 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRCollectionFilterConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRCollectionFilterConditionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; +package com.rawlabs.snapi.truffle.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRCollectionFilterConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRExistsConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRExistsConditionNode.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRExistsConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRExistsConditionNode.java index 93c6f8158..f0f5dd4f0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRExistsConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRExistsConditionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; +package com.rawlabs.snapi.truffle.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRExistsConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRFromBodyConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRFromBodyConditionNode.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRFromBodyConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRFromBodyConditionNode.java index bf4d7dd85..6ad4999e7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRFromBodyConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRFromBodyConditionNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; +package com.rawlabs.snapi.truffle.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class OSRFromBodyConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRHasNextConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRHasNextConditionNode.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRHasNextConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRHasNextConditionNode.java index 5ae2ab9fd..9d001a68b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRHasNextConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRHasNextConditionNode.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; +package com.rawlabs.snapi.truffle.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodesFactory; public class OSRHasNextConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java index 648d6d186..85289f965 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRIsLessThanSizeConditionNode.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; +package com.rawlabs.snapi.truffle.ast.osr.conditions; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class OSRIsLessThanSizeConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRListParseJsonConditionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRListParseJsonConditionNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java index f7786ef2a..29a3a5a06 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/ast/osr/conditions/OSRListParseJsonConditionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/conditions/OSRListParseJsonConditionNode.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; +package com.rawlabs.snapi.truffle.ast.osr.conditions; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodesFactory; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodesFactory; public class OSRListParseJsonConditionNode extends ExpressionNode { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Nullable.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/Nullable.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Nullable.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/Nullable.java index 372a67a4c..3eb24f555 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Nullable.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/Nullable.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.tryable_nullable; +package com.rawlabs.snapi.truffle.ast.tryable_nullable; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public class Nullable { public static boolean isNull(Object value) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Tryable.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/Tryable.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Tryable.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/Tryable.java index 0edc8d473..3bd5bf507 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/Tryable.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/Tryable.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.tryable_nullable; +package com.rawlabs.snapi.truffle.ast.tryable_nullable; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; public class Tryable { public static boolean isError(Object value) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/TryableNullableNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/TryableNullableNodes.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/TryableNullableNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/TryableNullableNodes.java index fbeb0b258..52978c2dd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/tryable_nullable/TryableNullableNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/tryable_nullable/TryableNullableNodes.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.tryable_nullable; +package com.rawlabs.snapi.truffle.ast.tryable_nullable; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.ErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.NullObject; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; +import com.rawlabs.snapi.truffle.runtime.primitives.NullObject; public class TryableNullableNodes { @NodeInfo(shortName = "TryableNodes.IsNull") @@ -73,7 +73,7 @@ static String exec(Node node, ErrorObject value) { @Specialization(guards = "!isError(value)") static String exec(Node node, Object value) { - throw new RawTruffleRuntimeException("not a failure"); + throw new TruffleRuntimeException("not a failure"); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SlotLocation.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SlotLocation.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SlotLocation.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SlotLocation.java index f152bd87c..1c405aca3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SlotLocation.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SlotLocation.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.compiler; +package com.rawlabs.snapi.truffle.emitter; public record SlotLocation(int depth, int slot) {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java index a38a66b8e..ae8c9ea68 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/SnapiTruffleEmitter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.compiler; +package com.rawlabs.snapi.truffle.emitter; import java.util.*; @@ -20,45 +20,43 @@ import org.bitbucket.inkytonik.kiama.relation.TreeRelation; import org.bitbucket.inkytonik.kiama.util.Entity; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.common.source.IdnExp; -import com.rawlabs.snapi.frontend.common.source.SourceNode; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.rql2.source.IdnExp; +import com.rawlabs.snapi.frontend.rql2.source.SourceNode; import com.rawlabs.snapi.frontend.rql2.*; -import com.rawlabs.snapi.frontend.rql2.api.EntryExtension; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.EntryExtension; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; -import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationFromStringEntry; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.controlflow.ExpBlockNode; -import com.rawlabs.snapi.truffle.runtime.ast.controlflow.IfThenElseNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.*; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.DivNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.ModNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.MultNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.SubNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.function.*; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.*; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionNoneNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordProjNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.unary.NegNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.unary.NotNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.local.*; -import com.rawlabs.snapi.truffle.runtime.ast.local.ReadClosureVariableNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.local.ReadLocalVariableNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.local.WriteLocalVariableNodeGen; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.function.Function; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.controlflow.ExpBlockNode; +import com.rawlabs.snapi.truffle.ast.controlflow.IfThenElseNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.*; +import com.rawlabs.snapi.truffle.ast.expressions.binary.DivNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.binary.ModNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.binary.MultNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.binary.SubNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.function.*; +import com.rawlabs.snapi.truffle.ast.expressions.literals.*; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionNoneNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordProjNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.unary.NegNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.unary.NotNodeGen; +import com.rawlabs.snapi.truffle.ast.local.*; +import com.rawlabs.snapi.truffle.ast.local.ReadClosureVariableNodeGen; +import com.rawlabs.snapi.truffle.ast.local.ReadLocalVariableNodeGen; +import com.rawlabs.snapi.truffle.ast.local.WriteLocalVariableNodeGen; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.function.Function; import scala.collection.JavaConverters; public class SnapiTruffleEmitter extends TruffleEmitter { private final Tree tree; - private final RawLanguage rawLanguage; + private final Rql2Language rawLanguage; private final ProgramContext programContext; private final SemanticAnalyzer analyzer; private final String uniqueId = UUID.randomUUID().toString().replace("-", "").replace("_", ""); @@ -315,10 +313,10 @@ private static TruffleEntryExtension getEntry(String pkgName, String entName) { return (TruffleEntryExtension) entry; } } - throw new RawTruffleInternalErrorException("Could not find entry for " + pkgName + "." + entName); + throw new TruffleInternalErrorException("Could not find entry for " + pkgName + "." + entName); } - public SnapiTruffleEmitter(Tree tree, RawLanguage rawLanguage, ProgramContext programContext) { + public SnapiTruffleEmitter(Tree tree, Rql2Language rawLanguage, ProgramContext programContext) { this.tree = tree; this.analyzer = tree.analyzer(); this.rawLanguage = rawLanguage; @@ -329,7 +327,7 @@ private Type tipe(Exp e) { return analyzer.tipe(e); } - public RawLanguage getLanguage() { + public Rql2Language getLanguage() { return this.rawLanguage; } @@ -453,7 +451,7 @@ private StatementNode recurseLetDecl(LetDecl ld) { getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); case PackageEntryType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; addSlot(entity, Integer.toString(slot)); yield WriteLocalVariableNodeGen.create(recurseExp(lb.e()), slot, rql2Type); @@ -490,7 +488,7 @@ private StatementNode recurseLetDecl(LetDecl ld) { RecClosureNode functionLiteralNode = new RecClosureNode(f, defaultArgs); yield WriteLocalVariableNodeGen.create(functionLiteralNode, slot, null); } - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } @@ -558,14 +556,14 @@ case Exp ignored when tipe(in) instanceof PackageType || tipe(in) instanceof Pac case Neq ignored -> NotNodeGen.create(new EqNode(recurseExp(be.left()), recurseExp(be.right()))); case Lt ignored -> new LtNode(recurseExp(be.left()), recurseExp(be.right())); case Le ignored -> new LeNode(recurseExp(be.left()), recurseExp(be.right())); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; case BinaryConst bc -> new BinaryConstNode(bc.bytes()); case LocationConst lc -> new LocationConstNode(lc.bytes(), lc.publicDescription()); case UnaryExp ue -> switch (ue.unaryOp()) { case Neg ignored -> NegNodeGen.create(recurseExp(ue.exp())); case Not ignored -> NotNodeGen.create(recurseExp(ue.exp())); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; case IdnExp ie -> { Entity entity = analyzer.entity().apply(ie.idn()); @@ -614,7 +612,7 @@ yield switch (entity) { yield new ReadParamClosureNode(depth, idx); } } - default -> throw new RawTruffleInternalErrorException("Unknown entity type"); + default -> throw new TruffleInternalErrorException("Unknown entity type"); }; } case IfThenElse ite -> new IfThenElseNode(recurseExp(ite.e1()), recurseExp(ite.e2()), recurseExp(ite.e3())); @@ -653,7 +651,7 @@ case FunApp fa when tipe(fa.f()) instanceof PackageEntryType -> { ExpressionNode[] exps = JavaConverters.asJavaCollection(fa.args()).stream().map(a -> recurseExp(a.e())).toArray(ExpressionNode[]::new); yield new InvokeNode(recurseExp(fa.f()), argNames, exps); } - default -> throw new RawTruffleInternalErrorException("Unknown expression type"); + default -> throw new TruffleInternalErrorException("Unknown expression type"); }; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java index 7b0075a05..9c2139140 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleArg.java @@ -13,6 +13,6 @@ package com.rawlabs.snapi.truffle.emitter; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public record TruffleArg(ExpressionNode exprNode, Type type, String identifier) {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleBuildBody.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleBuildBody.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleBuildBody.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleBuildBody.java index 87599dca2..a77ae1a0f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleBuildBody.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleBuildBody.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.compiler; +package com.rawlabs.snapi.truffle.emitter; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; public interface TruffleBuildBody { public ExpressionNode buildBody(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEmit.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEmit.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java index b5e9d5cbf..35be50b82 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEmit.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.compiler; +package com.rawlabs.snapi.truffle.emitter; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.nodes.RootNode; import com.rawlabs.compiler.Entrypoint; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.common.source.SourceProgram; import com.rawlabs.snapi.frontend.rql2.ProgramContext; import com.rawlabs.snapi.frontend.rql2.Tree; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.controlflow.ExpBlockNode; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.rql2.source.SourceProgram; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.controlflow.ExpBlockNode; import scala.collection.JavaConverters; public class TruffleEmit { public static Entrypoint doEmit( SourceProgram program, - RawLanguage language, + Rql2Language language, com.rawlabs.snapi.frontend.base.ProgramContext programContext) { ProgramContext ctx = (com.rawlabs.snapi.frontend.rql2.ProgramContext) programContext; Tree tree = new Tree(program, true, ctx); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java index ac8dfda07..8444ff83c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java @@ -13,13 +13,12 @@ package com.rawlabs.snapi.truffle.emitter; import com.oracle.truffle.api.frame.FrameDescriptor; -import com.rawlabs.snapi.frontend.common.source.Exp; +import com.rawlabs.snapi.frontend.rql2.source.Exp; import com.rawlabs.snapi.frontend.rql2.source.Rql2Method; -import com.rawlabs.snapi.truffle.emitter.compiler.TruffleBuildBody; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.function.ClosureNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.expressions.function.ClosureNode; public abstract class TruffleEmitter { protected abstract void addScope(); @@ -32,7 +31,7 @@ public abstract class TruffleEmitter { public abstract FrameDescriptor.Builder getFrameDescriptorBuilder(); - public abstract RawLanguage getLanguage(); + public abstract Rql2Language getLanguage(); protected abstract StatementNode emitMethod(Rql2Method m); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java index 77cdf4616..25c047ac7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java @@ -13,14 +13,14 @@ package com.rawlabs.snapi.truffle.emitter; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.List; import java.util.stream.Collectors; public interface TruffleEntryExtension { - default ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { throw new UnsupportedOperationException("Not implemented"); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEntrypoint.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntrypoint.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEntrypoint.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntrypoint.java index 713037c64..cdfb93bc2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/compiler/TruffleEntrypoint.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntrypoint.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.compiler; +package com.rawlabs.snapi.truffle.emitter; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.nodes.RootNode; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java index 3ca9e9d6a..0b6ad1f1d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.List; import java.util.stream.Collectors; import scala.Tuple2; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java index e8ab5cf7e..6afb9061e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; import java.util.List; import java.util.Optional; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java index eff5ecbfd..ff20a77ce 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.aws_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.AwsV4SignedRequest; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.AwsV4SignedRequest; import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.aws_package.AwsV4SignedRequestNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.aws_package.AwsV4SignedRequestNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; import java.util.Optional; import scala.collection.immutable.HashSet; @@ -33,7 +33,7 @@ public class TruffleAwsV4SignedRequestEntry extends AwsV4SignedRequest implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode key = args.get(0).exprNode(); ExpressionNode secretKey = args.get(1).exprNode(); ExpressionNode service = args.get(2).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java index 1a8797389..9240d4fc5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.BinaryBase64Entry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BinaryBase64Entry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package.BinaryBase64NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package.BinaryBase64NodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java index 78cb4d78f..dc85223af 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.BinaryReadEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BinaryReadEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package.BinaryReadNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package.BinaryReadNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java index 15f586671..39d095073 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.FromStringBinaryEntryExtension; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FromStringBinaryEntryExtension; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package.BinaryFromStringNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package.BinaryFromStringNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java index e471905ec..1ed8feaba 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.byte_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ByteFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ByteFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.byte_package.ByteFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.byte_package.ByteFromNodeGen; import java.util.List; public class TruffleByteFromEntry extends ByteFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ByteFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java index ff09cbb79..b07969aee 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.BuildCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BuildCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionBuildNode; import java.util.List; public class TruffleBuildCollectionEntry extends BuildCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new CollectionBuildNode( args.stream().map(TruffleArg::exprNode).toArray(ExpressionNode[]::new)); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java index 6b9b22648..33946d4ff 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.CountCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CountCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; public class TruffleCountCollectionEntry extends CountCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java index e892d20d2..6a9ebb86b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.DistinctCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DistinctCollectionEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionDistinctNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionDistinctNodeGen; import java.util.List; public class TruffleDistinctCollectionEntry extends DistinctCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java index 2b32688cb..069ef77bd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.EmptyCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EmptyCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionBuildNode; import java.util.List; public class TruffleEmptyCollectionEntry extends EmptyCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new CollectionBuildNode(new ExpressionNode[0]); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java index 2fd055e48..c9be6ab07 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java @@ -15,13 +15,13 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.ExistsCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ExistsCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionExistsNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionExistsNode; import java.util.List; public class TruffleExistsCollectionEntry extends ExistsCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java index 5129f119e..4284ab729 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java @@ -15,13 +15,13 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.FilterCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FilterCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFilterNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFilterNode; import java.util.List; public class TruffleFilterCollectionEntry extends FilterCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java index 6fdceff8c..fbafc1bda 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.FirstCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FirstCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFirstNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFirstNodeGen; import java.util.List; public class TruffleFirstCollectionEntry extends FirstCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return CollectionFirstNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java index 501f24a3e..9d79cad15 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.FromCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FromCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; public class TruffleFromCollectionEntry extends FromCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return CollectionFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java index 2a7358823..f3b036601 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.GroupCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.GroupCollectionEntry; import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionGroupByNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionGroupByNodeGen; import java.util.Arrays; import java.util.List; import scala.collection.JavaConverters; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java index a0b6bfa32..a59753646 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java @@ -15,16 +15,16 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.InternalEquiJoinCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.InternalEquiJoinCollectionEntry; import com.rawlabs.snapi.frontend.rql2.source.FunType; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionEquiJoinNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionEquiJoinNode; import java.util.List; public class TruffleInternalEquiJoinCollectionEntry extends InternalEquiJoinCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java index 1d62f91a6..abf58baa8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java @@ -15,16 +15,16 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.InternalJoinCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.InternalJoinCollectionEntry; import com.rawlabs.snapi.frontend.rql2.source.FunType; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionJoinNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionJoinNodeGen; import java.util.List; public class TruffleInternalJoinCollectionEntry extends InternalJoinCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java index 80a27be74..005050023 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.LastCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LastCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; public class TruffleLastCollectionEntry extends LastCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java index 44b629b2a..e0892b7aa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.MaxCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MaxCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; public class TruffleMaxCollectionEntry extends MaxCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java index 1d66ca264..267d5c214 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.MinCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MinCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; public class TruffleMinCollectionEntry extends MinCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java index fd003e321..bc0ff4f36 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.MkStringCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MkStringCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionMkStringNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionMkStringNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; public class TruffleMkStringCollectionEntry extends MkStringCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java index cafbddff6..9f60ddce5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java @@ -15,16 +15,16 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.OrderByCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OrderByCollectionEntry; import com.rawlabs.snapi.frontend.rql2.source.FunType; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionOrderByNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionOrderByNode; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java index 3a9aaa4bd..34986ec60 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.SumCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SumCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; import java.util.List; public class TruffleSumCollectionEntry extends SumCollectionEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java index 8ed29344d..77874e87a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TakeCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TakeCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTakeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTakeNodeGen; import java.util.List; public class TruffleTakeCollectionEntry extends TakeCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return CollectionTakeNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java index 41527ae67..3c6749b5c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java @@ -13,19 +13,19 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TransformCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TransformCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTransformNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTransformNodeGen; import java.util.List; public class TruffleTransformCollectionEntry extends TransformCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return CollectionTransformNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java index e704d3dbe..4d60f7d33 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java @@ -15,13 +15,13 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.TupleAvgCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TupleAvgCollectionEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTupleAvgNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTupleAvgNode; import java.util.List; public class TruffleTupleAvgCollectionEntry extends TupleAvgCollectionEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java index dc7e89082..4d65e415b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.UnionCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.UnionCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionUnionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionUnionNode; import java.util.List; public class TruffleUnionCollectionEntry extends UnionCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new CollectionUnionNode( args.stream().map(TruffleArg::exprNode).toArray(ExpressionNode[]::new)); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java index 3716ebd5c..4c91a89b6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.UnnestCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.UnnestCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionUnnestNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionUnnestNodeGen; import java.util.List; public class TruffleUnnestCollectionEntry extends UnnestCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return CollectionUnnestNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java index b5539c479..d2e0518e1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ZipCollectionEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ZipCollectionEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionZipNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionZipNodeGen; import java.util.List; public class TruffleZipCollectionEntry extends ZipCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return CollectionZipNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java index 5dd61834a..4d9ba62bc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java @@ -16,15 +16,15 @@ import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.rql2.source.*; import com.rawlabs.snapi.truffle.emitter.TruffleArg; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionSomeNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionSomeNodeGen; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import scala.collection.JavaConverters; import scala.collection.immutable.HashSet; import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.nullable; @@ -87,7 +87,7 @@ public CsvParser(List args) { } private RecordParseCsvNode getRecordParser( - Rql2TypeWithProperties t, RawLanguage lang) { + Rql2TypeWithProperties t, Rql2Language lang) { Rql2IterableType rql2IterableType = (Rql2IterableType) t; Rql2RecordType rql2RecordType = (Rql2RecordType) rql2IterableType.innerType(); assert rql2RecordType.props().isEmpty(); @@ -105,7 +105,7 @@ private RecordParseCsvNode getRecordParser( } public ExpressionNode stringParser( - ExpressionNode str, Rql2TypeWithProperties t, RawLanguage lang) { + ExpressionNode str, Rql2TypeWithProperties t, Rql2Language lang) { return new IterableParseCsvString( str, skip, @@ -120,7 +120,7 @@ public ExpressionNode stringParser( timestampFormat); } - public ExpressionNode fileParser(ExpressionNode url, Rql2TypeWithProperties t, RawLanguage lang) { + public ExpressionNode fileParser(ExpressionNode url, Rql2TypeWithProperties t, Rql2Language lang) { return new IterableParseCsvFile( url, encoding, @@ -136,7 +136,7 @@ public ExpressionNode fileParser(ExpressionNode url, Rql2TypeWithProperties t, R timestampFormat); } - private ExpressionNode columnParser(Type t, RawLanguage lang) { + private ExpressionNode columnParser(Type t, Rql2Language lang) { return switch (t) { case Rql2TypeWithProperties r when r.props().contains(tryable) -> { ExpressionNode inner = columnParser(r.cloneAndRemoveProp(tryable), lang); @@ -156,7 +156,7 @@ private ExpressionNode columnParser(Type t, RawLanguage lang) { case Rql2TimeType ignored -> new OptionTimeParseCsvNode(); case Rql2TimestampType ignored -> new OptionTimestampParseCsvNode(); case Rql2UndefinedType ignored -> new OptionUndefinedParseCsvNode(); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; case Rql2TypeWithProperties r -> { assert r.props().isEmpty(); @@ -173,14 +173,14 @@ yield switch (r){ case Rql2TimeType ignored -> new TimeParseCsvNode(); case Rql2TimestampType ignored -> new TimestampParseCsvNode(); case Rql2UndefinedType ignored -> new UndefinedParseCsvNode(); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } - private ProgramExpressionNode program(ExpressionNode e, RawLanguage lang){ + private ProgramExpressionNode program(ExpressionNode e, Rql2Language lang){ FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramExpressionNode(lang, frameDescriptor, e); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java index 9f5e788e3..67f718477 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.CsvParseEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CsvParseEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; public class TruffleCsvParseEntry extends CsvParseEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { CsvParser makeParser = new CsvParser(args); ExpressionNode url = args.stream().filter(a -> a.identifier() == null).findFirst().orElseThrow().exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java index 1e55662b0..6ba2d2a9f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.CsvReadEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CsvReadEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; public class TruffleCsvReadEntry extends CsvReadEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { CsvParser makeParser = new CsvParser(args); ExpressionNode url = args.stream().filter(a -> a.identifier() == null).findFirst().orElseThrow().exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java index 0eff8161a..5534a36e6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateAddIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateAddIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateAddIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateAddIntervalNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java index 81d76a284..1b6677e27 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateBuildEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateBuildNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateBuildNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java index 8dea4a61a..5a13c532a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateDayEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateDayEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateDayNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateDayNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java index 010fed76f..0b5031d44 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateFromEpochDayEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateFromEpochDayEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateFromEpochDayNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateFromEpochDayNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java index 46559fa4d..fc8db21bd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateFromTimestampEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateFromTimestampEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateFromTimestampNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateFromTimestampNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java index d0d3690bc..ec545edcd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateMonthEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateMonthEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateMonthNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateMonthNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java index 8edcc414b..723eb53c8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateNowEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateNowEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateNowNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateNowNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java index f2d9eeba2..f07e67a66 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateParseEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateParseEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateParseNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java index f5c65ea6a..ba6512c4a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateSubtractEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateSubtractNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateSubtractNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java index 53d4fc65a..611c7e0ae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateSubtractIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateSubtractIntervalNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java index 568029f17..c46f90766 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DateYearEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateYearEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateYearNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package.DateYearNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java index 71f877ed8..bee6b7911 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.DecimalFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DecimalFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.decimal_package.DecimalFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package.DecimalFromNodeGen; import java.util.List; public class TruffleDecimalFromEntry extends DecimalFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return DecimalFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java index b848805c2..605aa9113 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.DecimalRoundEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DecimalRoundEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.decimal_package.DecimalRoundNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package.DecimalRoundNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java index 12730a450..28deabb9a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.double_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.DoubleFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DoubleFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.double_package.DoubleFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.double_package.DoubleFromNodeGen; import java.util.List; public class TruffleDoubleFromEntry extends DoubleFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return DoubleFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java index 2fb53a8da..f39f4069e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java @@ -13,20 +13,20 @@ package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentParameterEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EnvironmentParameterEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package.EnvironmentParameterNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package.EnvironmentParameterNodeGen; import java.util.List; import scala.collection.immutable.HashSet; public class TruffleEnvironmentParameterEntry extends EnvironmentParameterEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode paramIndex = args.get(1).exprNode(); return EnvironmentParameterNodeGen.create( paramIndex, (Rql2Type) resetProps(type, new HashSet<>())); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java index 3c46627d1..7883e2389 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentScopesEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EnvironmentScopesEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package.EnvironmentScopesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package.EnvironmentScopesNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java index 7f01fb93f..9fc238705 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.EnvironmentSecretEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EnvironmentSecretEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package.EnvironmentSecretNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package.EnvironmentSecretNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java index b0bf9da79..c5530b6be 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ErrorBuildEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableFailureNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableFailureNodeGen; import java.util.List; public class TruffleErrorBuildEntry extends ErrorBuildEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableFailureNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java index 2ac977d76..62e51f665 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ErrorBuildWithTypeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ErrorBuildWithTypeEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableFailureWithTypeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableFailureWithTypeNodeGen; import java.util.List; public class TruffleErrorBuildWithTypeEntry extends ErrorBuildWithTypeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableFailureWithTypeNodeGen.create(args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java index 05af2a843..6328d085c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ErrorGetEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ErrorGetEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableGetFailureNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableGetFailureNodeGen; import java.util.List; public class TruffleErrorGetEntry extends ErrorGetEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableGetFailureNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java index 29c2a10d2..13169c980 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.float_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.FloatFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FloatFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; import java.util.List; public class TruffleFloatFromEntry extends FloatFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return FloatFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java index 0f763325d..24f64d555 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.function_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.FunctionInvokeAfterEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FunctionInvokeAfterEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.function_package.FunctionInvokeAfterNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.function_package.FunctionInvokeAfterNodeGen; import java.util.List; public class TruffleFunctionInvokeAfterEntry extends FunctionInvokeAfterEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return FunctionInvokeAfterNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java index 2ee3f3478..f17c1a218 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java @@ -13,13 +13,13 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.HttpCallEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpCallEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromHttpNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromHttpNode; import java.util.List; public abstract class TruffleHttpCallEntry extends HttpCallEntry @@ -33,7 +33,7 @@ public TruffleHttpCallEntry(String method) { } @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode url = args.get(0).exprNode(); ExpressionNode bodyString = arg(args, "bodyString").orElse(null); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java index 95a40bbaf..46bfd4ce2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.HttpReadEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpReadEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package.HttpReadNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package.HttpReadNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java index ef9504ead..177b4eb9d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlDecodeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpUrlDecodeEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package.HttpUrlDecodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package.HttpUrlDecodeNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java index c5bc25e33..438dd661e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.HttpUrlEncodeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpUrlEncodeEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package.HttpUrlEncodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package.HttpUrlEncodeNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java index d117048d9..9ee9c2dd2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.int_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.IntFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.int_package.IntFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package.IntFromNodeGen; import java.util.List; public class TruffleIntFromEntry extends IntFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return IntFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java index 71f670cf4..e75cc7ec1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.int_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.IntRangeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntRangeEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.int_package.IntRangeNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package.IntRangeNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; public class TruffleIntRangeEntry extends IntRangeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode start = args.get(0).exprNode(); ExpressionNode end = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java index 367cf5bd9..9f353ef4d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.BuildIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BuildIntervalEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; public class TruffleBuildIntervalEntry extends BuildIntervalEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode y = args.stream() .filter(a -> a.identifier() != null && a.identifier().equals("years")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java index ddad60ab2..ec55e7260 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalDaysEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalDaysEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalDaysNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalDaysNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java index 37b57c065..373464004 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalFromMillisEntryExtension; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalFromMillisEntryExtension; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalFromMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalFromMillisNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java index 32141ee34..9091f18f3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalHoursEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalHoursEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalHoursNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalHoursNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java index 28f64472b..0873a057d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalMillisEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalMillisEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalMillisNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java index d3ed497ae..5656973a2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalMinutesEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalMinutesEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMinutesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalMinutesNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java index 1355a6268..a4130419d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalMonthsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalMonthsEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMonthsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalMonthsNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java index 8b08c74b9..c0bcda9af 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalParseEntryExtension; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalParseEntryExtension; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalParseNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java index 4f6673bad..d28cb05c2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalSecondsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalSecondsEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalSecondsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalSecondsNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java index 9ea117709..4a96b1bbf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalToMillisEntryExtension; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalToMillisEntryExtension; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalToMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalToMillisNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java index c579d3aee..8b5e9da37 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalWeeksEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalWeeksEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalWeeksNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalWeeksNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java index dc5fbb48d..926bcae5a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalYearsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalYearsEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalYearsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalYearsNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java index 1aa9da0bf..62da8a516 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java @@ -17,14 +17,13 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.jdbc.JdbcQueryNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal.*; -import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.jdbc.JdbcQueryNode; +import com.rawlabs.snapi.truffle.ast.io.jdbc.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; import scala.collection.JavaConverters; public class Jdbc { @@ -33,7 +32,7 @@ static public JdbcQueryNode query( ExpressionNode query, Type t, JdbcExceptionHandler exceptionHandler, - RawLanguage lang) { + Rql2Language lang) { Rql2IterableType iterableType = (Rql2IterableType) t; Rql2RecordType recordType = (Rql2RecordType) iterableType.innerType(); assert iterableType.props().isEmpty(); @@ -56,7 +55,7 @@ static public JdbcQueryNode query( exceptionHandler); } - static private ProgramExpressionNode columnReader(String colName, Type t, RawLanguage lang) { + static private ProgramExpressionNode columnReader(String colName, Type t, Rql2Language lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); ExpressionNode node = switch (t){ case Rql2TypeWithProperties r when r.props().contains(tryable) -> { @@ -80,7 +79,7 @@ static private ProgramExpressionNode columnReader(String colName, Type t, RawLan case Rql2TimestampType ignored -> new TimestampReadJdbcQuery(colName); case Rql2BoolType ignored -> new BoolReadJdbcQuery(colName); case Rql2BinaryType ignored -> new BinaryReadJdbcQuery(colName); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; return new ProgramExpressionNode(lang, frameDescriptor, node); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java index b6d062bc1..9761563af 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java @@ -15,25 +15,25 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.*; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.BinaryParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.BooleanParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.ByteParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.DateParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.DecimalParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.DoubleParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.FloatParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.IntParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.IntervalParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.LongParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.ShortParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.StringParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.TimeParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser.TimestampParseJsonNodeGen; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.*; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.BinaryParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.BooleanParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.ByteParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.DateParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.DecimalParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.DoubleParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.FloatParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.IntParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.IntervalParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.LongParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.ShortParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.StringParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.TimeParseJsonNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.TimestampParseJsonNodeGen; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import scala.collection.JavaConverters; import java.util.LinkedHashMap; @@ -53,11 +53,11 @@ public JsonParser(ExpressionNode dateFormat, ExpressionNode timeFormat, Expressi this.timestampFormat = timestampFormat; } - public ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, RawLanguage lang) { + public ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, Rql2Language lang) { return recurse(tipe, true, lang); } - private ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, boolean appendNullCheck, RawLanguage lang) { + private ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, boolean appendNullCheck, Rql2Language lang) { FrameDescriptor.Builder builder = FrameDescriptor.newBuilder(); int parserSlot = builder.addSlot( @@ -144,19 +144,19 @@ yield new RecordParseJsonNode( yield new OrParseJsonNode(children); } case Rql2UndefinedType ignored -> new UndefinedParseJsonNode(); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; if (appendNullCheck) { yield new CheckNonNullJsonNode(program(result, builder.build(), lang)); } else yield result; } - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; return program(e, builder.build(), lang); } - private ProgramExpressionNode program(ExpressionNode e, FrameDescriptor frameDescriptor, RawLanguage lang){ + private ProgramExpressionNode program(ExpressionNode e, FrameDescriptor frameDescriptor, Rql2Language lang){ return new ProgramExpressionNode(lang, frameDescriptor, e); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java index de7cb70a9..ec172fa14 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java @@ -15,21 +15,21 @@ import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.tryable; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ParseJsonEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ParseJsonEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParseNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParseNodeGen; +import com.rawlabs.snapi.truffle.ast.io.json.reader.TryableTopLevelWrapper; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParseNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParseNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; import java.util.List; public class TruffleParseJsonEntry extends ParseJsonEntry implements TruffleEntryExtension, WithJsonArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode timeFormat = timeFormat(args); ExpressionNode dateFormat = dateFormat(args); ExpressionNode timestampFormat = timestampFormat(args); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java index a32b73300..57c7440a3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java @@ -13,19 +13,19 @@ package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.PrintJsonEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.PrintJsonEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonPrintNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.emitter.output.JsonWriter; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonPrintNodeGen; +import com.rawlabs.snapi.truffle.emitter.writers.JsonWriter; import java.util.List; public class TrufflePrintJsonEntry extends PrintJsonEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return JsonPrintNodeGen.create( args.getFirst().exprNode(), JsonWriter.recurse((Rql2TypeWithProperties) args.getFirst().type(), rawLanguage) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java index 3ca94fdfd..fdde41658 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java @@ -15,16 +15,16 @@ import java.util.List; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ReadJsonEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ReadJsonEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonReadCollectionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonReadValueNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonReadCollectionNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonReadValueNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.TryableTopLevelWrapper; import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; @@ -32,7 +32,7 @@ public class TruffleReadJsonEntry extends ReadJsonEntry implements TruffleEntryExtension, WithJsonArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode encoding = encoding(args); ExpressionNode timeFormat = timeFormat(args); ExpressionNode dateFormat = dateFormat(args); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java index 735117208..4fbf64fed 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/WithJsonArgs.java @@ -12,10 +12,10 @@ package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; public interface WithJsonArgs extends WithArgs { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java index 0403c43eb..d3ed35d7b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java @@ -13,19 +13,19 @@ package com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.KryoDecodeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.KryoDecodeEntry; import com.rawlabs.snapi.frontend.rql2.source.ExpType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.kryo.KryoFromNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.io.kryo.KryoFromNode; import java.util.List; public class TruffleKryoDecodeEntry extends KryoDecodeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpType exprType = (ExpType) args.get(1).type(); return new KryoFromNode(args.get(0).exprNode(), (Rql2TypeWithProperties) exprType.t()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java index fd4f1aa8b..923d70226 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.KryoEncodeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.KryoEncodeEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.io.kryo.KryoWriteNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.io.kryo.KryoWriteNode; import java.util.List; public class TruffleKryoEncodeEntry extends KryoEncodeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new KryoWriteNode(args.get(0).exprNode(), (Rql2TypeWithProperties) args.get(0).type()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java index 651cc8ff8..5965b7b73 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.BuildListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BuildListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; import java.util.List; public class TruffleBuildListEntry extends BuildListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new ListBuildNode( type, args.stream().map(TruffleArg::exprNode).toArray(ExpressionNode[]::new)); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java index 04c84a460..9c0b1a564 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.CountListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CountListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListCountNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListCountNodeGen; import java.util.List; public class TruffleCountListEntry extends CountListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ListCountNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java index 70acb1821..d1072c3b1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.EmptyListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EmptyListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListBuildNode; import java.util.List; public class TruffleEmptyListEntry extends EmptyListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new ListBuildNode(type, new ExpressionNode[0]); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java index 1660e29b8..0f12361bc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java @@ -15,13 +15,13 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.ExistsListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ExistsListEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListExistsNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListExistsNode; import java.util.List; public class TruffleExistsListEntry extends ExistsListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java index 4c517e4ec..7a3cb96ac 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.FilterListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FilterListEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFilterNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFilterNode; import java.util.List; public class TruffleFilterListEntry extends FilterListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java index b9668dd9f..09384cc9b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.FirstListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FirstListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFirstNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFirstNodeGen; import java.util.List; public class TruffleFirstListEntry extends FirstListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ListFirstNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java index 3364a386f..2e9c8ca1d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.FromListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FromListEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromNode; import java.util.List; public class TruffleFromListEntry extends FromListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java index ed0eb7873..6b40d9af4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.GetListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.GetListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListGetNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListGetNodeGen; import java.util.List; public class TruffleGetListEntry extends GetListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ListGetNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java index a167844f1..cd148442c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java @@ -15,14 +15,14 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.GroupListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.GroupListEntry; import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListGroupByNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListGroupByNode; import java.util.Arrays; import java.util.List; import scala.collection.JavaConverters; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java index 4ad5cac8f..424d8af88 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LastListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LastListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListLastNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListLastNodeGen; import java.util.List; public class TruffleLastListEntry extends LastListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ListLastNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java index ce42a174a..22a791131 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.MaxListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MaxListEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; public class TruffleMaxListEntry extends MaxListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java index 70a78fb05..fa68acd44 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.MinListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MinListEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; public class TruffleMinListEntry extends MinListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java index 3d790c864..e5bd6985d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.SumListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SumListEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; +import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.AggregateSingleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation.Aggregations; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionFromNodeGen; import java.util.List; public class TruffleSumListEntry extends SumListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java index b1c7a1632..3f2425eba 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TakeListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TakeListEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListTakeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListTakeNodeGen; import java.util.List; public class TruffleTakeListEntry extends TakeListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ListTakeNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java index d67d1871d..b8c5c2b30 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.TransformListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TransformListEntry; import com.rawlabs.snapi.frontend.rql2.source.FunType; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListTransformNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListTransformNode; import java.util.List; public class TruffleTransformListEntry extends TransformListEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java index 82078f9c9..9b75dfa20 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java @@ -15,15 +15,15 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.UnsafeFromListEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.UnsafeFromListEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromUnsafe; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromUnsafe; import java.util.List; public class TruffleUnsafeFromListEntry extends UnsafeFromListEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java index 64dbef8a2..498062e22 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java @@ -13,19 +13,19 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LocationDescribeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationDescribeEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationDescribeNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationDescribeNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; public class TruffleLocationDescribeEntry extends LocationDescribeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode sampleSize = args.stream() .filter(a -> a.identifier() != null && a.identifier().contains("sampleSize")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java index 98e3e005f..dbbdb8ce7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java @@ -13,19 +13,19 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LocationFromStringEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationFromStringEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromStringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromStringNode; import java.util.List; public class TruffleLocationFromStringEntry extends LocationFromStringEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode url = args.get(0).exprNode(); return new LocationFromStringNode(url); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java index 526b04893..82f14585c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LocationLlEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationLlEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationLlNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationLlNodeGen; import java.util.List; public class TruffleLocationLlEntry extends LocationLlEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return LocationLlNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java index 3536ad221..f239011dc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LocationLsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationLsEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationLsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationLsNodeGen; import java.util.List; public class TruffleLocationLsEntry extends LocationLsEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return LocationLsNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java index 15ebf0164..1042d99b8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.long_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LongFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LongFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.long_package.LongFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package.LongFromNodeGen; import java.util.List; public class TruffleLongFromEntry extends LongFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return LongFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java index 6050d4f58..786fc002e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.long_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.LongRangeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LongRangeEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.long_package.LongRangeNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.LongNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package.LongRangeNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.LongNode; import java.util.List; public class TruffleLongRangeEntry extends LongRangeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode start = args.get(0).exprNode(); ExpressionNode end = args.get(1).exprNode(); ExpressionNode step = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java index bdf9e69d4..1fb9bf830 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.MathAbsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAbsEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAbsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAbsNodeGen; import java.util.List; public class TruffleMathAbsEntry extends MathAbsEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return MathAbsNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java index 2608da2a5..799d50dac 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathAcosEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAcosEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAcosNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAcosNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java index 58507ea20..3e3ed7647 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathAsinEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAsinEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAsinNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAsinNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java index 8e36bbc97..f5f365635 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathAtanEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAtanEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAtanNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAtanNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java index e4b6f9db0..fc172cbd1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathAtn2Entry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAtn2Entry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAtn2NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathAtn2NodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java index b30651b4a..1c0ecc8e8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathCeilingEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathCeilingEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathCeilingNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathCeilingNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java index c0114e96f..71f26a26a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathCosEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathCosEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathCosNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathCosNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java index 3f3f63193..89601ba51 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathCotEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathCotEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathCotNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathCotNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java index d114a7a58..46edb8daf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathDegreesEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathDegreesEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathDegreesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathDegreesNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java index c528c13d2..4804c91de 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathExpEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathExpEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathExpNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathExpNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java index 60d98e664..27348d114 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathFloorEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathFloorEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathFloorNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathFloorNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java index f77c20cbd..033b4561b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathLog10Entry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathLog10Entry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathLog10NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathLog10NodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java index cdf5ec51a..b7ede7f50 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathLogEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathLogEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathLogNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathLogNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java index 1f08d6f8e..26a58468d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathPiEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathPiEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.DoubleNode; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.DoubleNode; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java index 05ec988c1..1bbc197c6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathPowerEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathPowerEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathPowerNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathPowerNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java index 4f647b0ea..6bbd82b62 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathRadiansEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathRadiansEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathRadiansNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathRadiansNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java index b2c68bf05..952210d49 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathRandomEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathRandomEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.DoubleNode; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.DoubleNode; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java index 9b026aa60..34245f747 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathSignEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSignEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSignNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSignNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java index b9ff0765f..adba90213 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathSinEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSinEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSinNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSinNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java index b744f8a7d..d376ea141 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathSqrtEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSqrtEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSqrtNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSqrtNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java index e6fc18aff..30ad9a838 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathSquareEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSquareEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSquareNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathSquareNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java index 0fe687132..9732365a3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.MathTanEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathTanEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathTanNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package.MathTanNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java index 59d00cd12..2eaba260b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java @@ -13,24 +13,24 @@ package com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.MySQLQueryEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MySQLQueryEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromMySQLCredentialNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromMySQLNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromMySQLCredentialNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromMySQLNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.MySQLExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.MySQLExceptionHandler; import java.util.List; public class TruffleMySQLQueryEntry extends MySQLQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java index 8cedbfc1a..8a343dea8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.NullableBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableBuildEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionSomeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionSomeNodeGen; import java.util.List; public class TruffleNullableBuildEntry extends NullableBuildEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return OptionSomeNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java index b1b7c7d59..b2199862d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.NullableEmptyEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableEmptyEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionNoneNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionNoneNode; import java.util.List; public class TruffleNullableEmptyEntry extends NullableEmptyEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new OptionNoneNode(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java index d71ca1801..a6f826bc1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.NullableIsNullEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableIsNullEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionIsDefinedNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.unary.NotNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionIsDefinedNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.unary.NotNodeGen; import java.util.List; public class TruffleNullableIsNullEntry extends NullableIsNullEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return NotNodeGen.create(OptionIsDefinedNodeGen.create(args.get(0).exprNode())); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java index 83a689ef8..6dc2770dd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.NullableTransformEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableTransformEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionMapNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionMapNodeGen; import java.util.List; public class TruffleNullableTransformEntry extends NullableTransformEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return OptionMapNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java index 7f9726a7b..78b59b4ea 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.NullableUnsafeGetEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableUnsafeGetEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionUnsafeGetNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionUnsafeGetNodeGen; import java.util.List; public class TruffleNullableUnsafeGetEntry extends NullableUnsafeGetEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return OptionUnsafeGetNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java index 937f2c50d..8e3c25c7c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java @@ -15,21 +15,21 @@ import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.FlatMapNullableTryableEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FlatMapNullableTryableEntry; import com.rawlabs.snapi.frontend.rql2.source.FunType; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionFlatMapNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionGetOrElseNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionMapNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionNoneNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableFlatMapNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableNullableFlatMapNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableSuccessNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionFlatMapNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionGetOrElseNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionMapNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionNoneNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableFlatMapNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableNullableFlatMapNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableSuccessNodeGen; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import java.util.List; public class TruffleFlatMapNullableTryableEntry extends FlatMapNullableTryableEntry @@ -74,7 +74,7 @@ else if (eType.props().contains(nullable) && outType.props().contains(nullable)) return OptionFlatMapNodeGen.create( emitter.recurseExp(args.get(0).e()), emitter.recurseExp(args.get(1).e())); } else { - throw new RawTruffleInternalErrorException(); + throw new TruffleInternalErrorException(); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java index 58d81bf36..4d6b66155 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java @@ -13,24 +13,24 @@ package com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.OracleQueryEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OracleQueryEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromOracleCredentialNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromOracleNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromOracleCredentialNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromOracleNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.OracleExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.OracleExceptionHandler; import java.util.List; public class TruffleOracleQueryEntry extends OracleQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java index b5b76ba14..ee4e5e534 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java @@ -13,24 +13,24 @@ package com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.PostgreSQLQueryEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.PostgreSQLQueryEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromPostgreSQLCredentialNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromPostgreSQLNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromPostgreSQLCredentialNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromPostgreSQLNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.PostgreSQLExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.PostgreSQLExceptionHandler; import java.util.List; public class TrufflePostgreSQLQueryEntry extends PostgreSQLQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java index 407a85de4..71afdf2fd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java @@ -13,20 +13,20 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordAddFieldEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordAddFieldEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordAddFieldNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordAddFieldNodeGen; import java.util.List; public class TruffleRecordAddFieldEntry extends RecordAddFieldEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { Rql2RecordType recordType = (Rql2RecordType) type; String f = recordType.atts().last().idn(); StringNode fieldName = new StringNode(f); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java index 49af5d74f..26d46b30f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java @@ -13,20 +13,20 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordBuildEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordBuildNode; import java.util.List; import scala.collection.JavaConverters; public class TruffleRecordBuildEntry extends RecordBuildEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { Rql2RecordType recordType = (Rql2RecordType) type; String[] fieldNames = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java index 435b70ca3..0a0403b23 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordConcatEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordConcatEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordConcatNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordConcatNodeGen; import java.util.List; public class TruffleRecordConcatEntry extends RecordConcatEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RecordConcatNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java index 43f038e4b..ea3840a2b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordFieldsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordFieldsEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordFieldsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordFieldsNodeGen; import java.util.List; public class TruffleRecordFieldsEntry extends RecordFieldsEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RecordFieldsNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java index fc7108f22..4399781a9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordGetFieldByIndexEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordGetFieldByIndexEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordProjNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordProjNodeGen; import java.util.List; public class TruffleRecordGetFieldByIndexEntry extends RecordGetFieldByIndexEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RecordProjNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java index 89fdd9d18..8e73bdbae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java @@ -13,15 +13,15 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordRemoveFieldEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordRemoveFieldEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordRemoveFieldNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordRemoveFieldNodeGen; import java.util.Arrays; import java.util.List; import scala.collection.JavaConverters; @@ -29,7 +29,7 @@ public class TruffleRecordRemoveFieldEntry extends RecordRemoveFieldEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { Rql2RecordType recordType = (Rql2RecordType) type; List finalFieldNames = JavaConverters.asJavaCollection(recordType.atts()).stream() diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java index d0fc643e1..f6e222c7e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RegexFirstMatchInEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexFirstMatchInEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexFirstMatchInNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexFirstMatchInNodeGen; import java.util.List; public class TruffleRegexFirstMatchInEntry extends RegexFirstMatchInEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RegexFirstMatchInNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java index 23dcd0740..67fa2aa17 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RegexGroupsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexGroupsEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexGroupsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexGroupsNodeGen; import java.util.List; public class TruffleRegexGroupsEntry extends RegexGroupsEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RegexGroupsNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java index f2a8817b0..fdb2dc9a1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RegexMatchesEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexMatchesEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexMatchesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexMatchesNodeGen; import java.util.List; public class TruffleRegexMatchesEntry extends RegexMatchesEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RegexMatchesNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java index 144a4cc9a..7d41001f3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.RegexReplaceEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexReplaceEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexReplaceNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package.RegexReplaceNodeGen; import java.util.List; public class TruffleRegexReplaceEntry extends RegexReplaceEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return RegexReplaceNodeGen.create( args.get(0).exprNode(), args.get(1).exprNode(), args.get(2).exprNode()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java index e5f081f21..73ef17a87 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.s3_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.S3BuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.S3BuildEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromS3Node; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromS3Node; import java.util.List; public class TruffleS3BuildEntry extends S3BuildEntry implements TruffleEntryExtension, WithArgs { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode url = args.get(0).exprNode(); ExpressionNode accessKey = arg(args, "accessKey").orElse(null); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java index d5fe0d01f..3428f443c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.short_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.ShortFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ShortFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.short_package.ShortFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.short_package.ShortFromNodeGen; import java.util.List; public class TruffleShortFromEntry extends ShortFromEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return ShortFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java index c317d380e..686ad969b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java @@ -13,23 +13,23 @@ package com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.SnowflakeQueryEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SnowflakeQueryEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSnowflakeCredentialNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSnowflakeNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSnowflakeCredentialNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSnowflakeNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.SnowflakeExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.SnowflakeExceptionHandler; import java.util.List; public class TruffleSnowflakeQueryEntry extends SnowflakeQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java index 44f1a777d..592f4b51a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java @@ -13,24 +13,24 @@ package com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.SQLServerQueryEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SQLServerQueryEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSQLServerCredentialNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSQLServerNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; import com.rawlabs.snapi.truffle.emitter.builtin.jdbc.Jdbc; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSQLServerCredentialNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package.LocationFromSQLServerNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.SqlServerExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.SqlServerExceptionHandler; import java.util.List; public class TruffleSQLServerQueryEntry extends SQLServerQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java index 7b1dbda9c..5c12b60aa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.Base64EntryExtension; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.Base64EntryExtension; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringBase64NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringBase64NodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java index 292a61c7c..55fe4dfb1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringCapitalizeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringCapitalizeEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringCapitalizeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringCapitalizeNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java index f48d327ab..2fbca44e5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringContainsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringContainsEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringContainsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringContainsNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java index 3549d2d6e..ed4584538 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringCountSubStringEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringCountSubStringEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringCountSubStringNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringCountSubStringNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java index 7cc4b4705..2a40971d9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringDecodeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringDecodeEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringDecodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringDecodeNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java index 4d26fdb18..01f96487b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringEmptyEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringEmptyEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringEmptyNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringEmptyNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java index ed324a84d..e167343cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringEncodeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringEncodeEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringEncodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringEncodeNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java index 5a009e942..a85e3add1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.StringFromEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringFromEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringFromNodeGen; import java.util.List; public class TruffleStringFromEntry extends StringFromEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return StringFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java index ce52ca4d6..2b98328bc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringLTrimEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLTrimEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLTrimNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLTrimNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java index db5b4df07..f1d73e93e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringLengthEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLengthEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLengthNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLengthNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java index e56ab83a8..519fad696 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringLevenshteinDistanceEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLevenshteinDistanceEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLevenshteinDistanceNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLevenshteinDistanceNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java index 839478fb2..46c416590 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringLowerEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLowerEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLowerNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringLowerNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java index 6d39f745e..4241c1473 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringRTrimEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringRTrimEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringRTrimNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringRTrimNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java index 8e8717a39..04c97c218 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.StringReadEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReadEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReadNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReadNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; public class TruffleStringReadEntry extends StringReadEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode encoding = args.stream() .filter(arg -> arg.identifier() != null && arg.identifier().equals("encoding")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java index caf3ab38e..62959b0a2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.StringReadLinesEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReadLinesEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReadLinesNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReadLinesNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; import java.util.List; public class TruffleStringReadLinesEntry extends StringReadLinesEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode encoding = args.stream() .filter(arg -> arg.identifier() != null && arg.identifier().equals("encoding")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java index bb4a44039..9f2eddf33 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.StringReplaceEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReplaceEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReplaceNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReplaceNodeGen; import java.util.List; public class TruffleStringReplaceEntry extends StringReplaceEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return StringReplaceNodeGen.create( args.get(0).exprNode(), args.get(1).exprNode(), args.get(2).exprNode()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java index dfcd2d9bd..ac0cf0fc7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringReplicateEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReplicateEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReplicateNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReplicateNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java index b0c09e799..a9d5ae3ca 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringReverseEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReverseEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReverseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringReverseNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java index 2e9ef4fb1..5d4c69aed 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringSplitEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringSplitEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringSplitNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringSplitNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java index cf9d18653..bc46b8016 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringStartsWithEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringStartsWithEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringStartsWithNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringStartsWithNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java index d397138a2..2a5707ede 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringSubStringEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringSubStringEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringSubStringNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringSubStringNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java index 4e5aac3b3..07c9e90e0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringTrimEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringTrimEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringTrimNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringTrimNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java index 8e93c601f..9103d9110 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.StringUpperEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringUpperEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringUpperNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package.StringUpperNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java index 071688eff..a4747f947 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.success_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.SuccessBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SuccessBuildEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableSuccessNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableSuccessNodeGen; import java.util.List; public class TruffleSuccessBuildEntry extends SuccessBuildEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableSuccessNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java index f87aeacc7..6adac6e7d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.BoolValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BoolValueArgTestEntry; public class TruffleBoolValueArgTestEntry extends BoolValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java index eab3a588a..93d96ec51 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.ByteValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ByteValueArgTestEntry; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; public class TruffleByteValueArgTestEntry extends ByteValueArgTestEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java index 4dae1b051..d661afcde 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.DateValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateValueArgTestEntry; public class TruffleDateValueArgTestEntry extends DateValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java index ebd499d61..00dcbdd68 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.DoubleValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DoubleValueArgTestEntry; public class TruffleDoubleValueArgTestEntry extends DoubleValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java index 773aa3291..c006b97ff 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.FloatValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FloatValueArgTestEntry; public class TruffleFloatValueArgTestEntry extends FloatValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java index 1e47bb9ca..b23066cd2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java @@ -12,6 +12,6 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.IntValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntValueArgTestEntry; public class TruffleIntValueArgTestEntry extends IntValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java index a6507567b..b9666890a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.IntervalValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalValueArgTestEntry; public class TruffleIntervalValueArgTestEntry extends IntervalValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java index e3e4ebc36..d810f100a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.ListValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ListValueArgTestEntry; public class TruffleListValueArgTestEntry extends ListValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java index e6d348778..88853b132 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.LongValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LongValueArgTestEntry; public class TruffleLongValueArgTestEntry extends LongValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java index 3711a6f32..85ff0189e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; import java.util.List; public interface TruffleMandatoryArgs extends TruffleEntryExtension { @Override - default ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new PlusNode(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java index 6cc934650..04465d33b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.MandatoryExpArgsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MandatoryExpArgsEntry; public class TruffleMandatoryExpArgsEntry extends MandatoryExpArgsEntry implements TruffleMandatoryArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java index ad11e5faa..30da71683 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.MandatoryValueArgsEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MandatoryValueArgsEntry; public class TruffleMandatoryValueArgsEntry extends MandatoryValueArgsEntry implements TruffleMandatoryArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java index ade84dc09..05e57487c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.MultNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.MultNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; public interface TruffleOptionalArgs extends TruffleEntryExtension, WithArgs { @Override - default ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode mandatory = mandatoryArgs(args)[0]; ExpressionNode x = arg(args, "x").orElse(new IntNode("10")); ExpressionNode y = arg(args, "y").orElse(new IntNode("10")); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java index 451711002..19fb5879f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.OptionalExpArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OptionalExpArgsTestEntry; public class TruffleOptionalExpArgsTestEntry extends OptionalExpArgsTestEntry implements TruffleOptionalArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java index 25b5eae9e..66239ad39 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.OptionalValueArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OptionalValueArgsTestEntry; public class TruffleOptionalValueArgsTestEntry extends OptionalValueArgsTestEntry implements TruffleOptionalArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java index fee7a868a..cd89dc68d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.RecordValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordValueArgTestEntry; public class TruffleRecordValueArgTestEntry extends RecordValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java index 1f14505a1..36d018b19 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.ShortValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ShortValueArgTestEntry; public class TruffleShortValueArgTestEntry extends ShortValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java index f306544bb..48aa70275 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java @@ -13,15 +13,15 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsColPassThroughTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StrictArgsColPassThroughTestEntry; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.MultNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTransformNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; +import com.rawlabs.snapi.truffle.ast.local.ReadParamNode; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.MultNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection.CollectionTransformNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; -import com.rawlabs.snapi.truffle.runtime.ast.local.ReadParamNode; import java.util.List; public class TruffleStrictArgsColPassThroughTestEntry extends StrictArgsColPassThroughTestEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java index 9a9fcffbb..9f51d0892 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java @@ -13,26 +13,26 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.StrictArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StrictArgsTestEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListCountNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.FloatNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.LongNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordBuildNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordProjNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.emitter.builtin.WithArgs; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListCountNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.FloatNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.LongNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordBuildNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordProjNodeGen; import java.util.List; public class TruffleStrictArgsTestEntry extends StrictArgsTestEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode listArg = args.get(0).exprNode(); ExpressionNode[] optionalArgs = optionalArgs(args); ExpressionNode recordArg = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java index a63d6d145..04a0f44f8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.StringValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringValueArgTestEntry; public class TruffleStringValueArgTestEntry extends StringValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java index 770d98dfb..525fa178f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeValueArgTestEntry; public class TruffleTimeValueArgTestEntry extends TimeValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java index ce0c3f980..192e7ec37 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampValueArgTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampValueArgTestEntry; public class TruffleTimestampValueArgTestEntry extends TimestampValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java index 21d4f7ab0..9c8c3af99 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.record.RecordBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.record.RecordBuildNode; import java.util.List; public interface TruffleValueArg extends TruffleEntryExtension { @Override - default ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new RecordBuildNode(new ExpressionNode[] {args.get(0).exprNode()}, new String[] {"arg"}); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java index d21cbf46b..5058f8e39 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; public interface TruffleVarArgs extends TruffleEntryExtension { @Override - default ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode result = new IntNode("0"); for (TruffleArg arg : args) { result = new PlusNode(result, arg.exprNode()); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java index 08d78ca4f..9f9afdfa4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java @@ -12,6 +12,6 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.VarExpArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarExpArgsTestEntry; public class TruffleVarExpArgsTestEntry extends VarExpArgsTestEntry implements TruffleVarArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java index 9baa17409..d2f485935 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java @@ -13,17 +13,17 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringExpTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarNullableStringExpTestEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; public class TruffleVarNullableStringExpTestEntry extends VarNullableStringExpTestEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return args.get(0).exprNode(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java index 73a05cbf4..17f7fe769 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java @@ -13,20 +13,20 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.VarNullableStringValueTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarNullableStringValueTestEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionGetOrElseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.binary.PlusNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionGetOrElseNodeGen; import java.util.List; public class TruffleVarNullableStringValueTestEntry extends VarNullableStringValueTestEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode result = new StringNode(""); for (TruffleArg arg : args) { result = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java index 6c1a78f39..0c4907ac9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java @@ -12,6 +12,6 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.builtin.VarValueArgsTestEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarValueArgsTestEntry; public class TruffleVarValueArgsTestEntry extends VarValueArgsTestEntry implements TruffleVarArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java index 351bad260..2337f69db 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeAddIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeAddIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeAddIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeAddIntervalNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java index a3cf4ab17..ab6d7955b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeBuildEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeBuildNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeBuildNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java index f02cf8e22..5758fb1c1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeHourEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeHourEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeHourNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeHourNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java index 8dc54f481..479113f70 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeMillisEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeMillisEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeMillisNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java index bd6b55e3d..a24449e1b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeMinuteEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeMinuteEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeMinuteNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeMinuteNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java index 237c1b812..09de423f5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeNowEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeNowEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeNowNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeNowNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java index 671d7faf0..984bcd20c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeParseEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeParseEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeParseNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java index b9a578f7f..a704ee3a4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeSecondEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeSecondEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeSecondNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeSecondNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java index fd423c394..42001044f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeSubtractEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeSubtractNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeSubtractNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java index c28773269..fc66a0f4f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimeSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeSubtractIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package.TimeSubtractIntervalNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java index 1c6006f4a..ce894c38e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampAddIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampAddIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampAddIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampAddIntervalNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java index d11f1abd7..6dfe2c6f3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampBuildEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampBuildEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampBuildNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampBuildNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java index d4b53b64a..6f925b252 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampDayEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampDayEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampDayNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampDayNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java index 0adf1c532..e591c4723 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromDateEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampFromDateEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampFromDateNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampFromDateNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java index 19d69fb99..d49ba3996 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampFromUnixTimestampEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampFromUnixTimestampEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampFromUnixTimestampNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampFromUnixTimestampNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java index 58e972743..31446257b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampHourEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampHourEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampHourNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampHourNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java index d5e488a04..f502258d9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampMillisEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampMillisEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampMillisNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java index 64e774f0f..9bc2a119a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampMinuteEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampMinuteEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMinuteNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampMinuteNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java index 3c0a76a82..4b16d8f37 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampMonthEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampMonthEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMonthNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampMonthNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java index dc1b75e82..84addfdf9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampNowEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampNowEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampNowNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampNowNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java index a626ae598..20a617c98 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampParseEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampParseEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampParseNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java index bc4f87767..4bed1fd32 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java @@ -13,14 +13,14 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampRangeEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampRangeEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampRangeNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampRangeNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.IntNode; import java.util.List; public class TruffleTimestampRangeEntry extends TimestampRangeEntry @@ -37,7 +37,7 @@ public class TruffleTimestampRangeEntry extends TimestampRangeEntry new IntNode("0"), new IntNode("0")); - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpressionNode start = args.get(0).exprNode(); ExpressionNode end = args.get(1).exprNode(); ExpressionNode step = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java index e53cae473..b4af2335a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampSecondEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampSecondEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSecondNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampSecondNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java index f7774f0b5..53f141a24 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampSubtractEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java index c87fd91f4..b055ebe2d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractIntervalNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java index 977340749..3aecdc5cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java @@ -13,28 +13,28 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampTimeBucketEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampTimeBucketEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2IntervalType; import com.rawlabs.snapi.frontend.rql2.source.Rql2StringType; import com.rawlabs.snapi.truffle.emitter.TruffleArg; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketIntervalNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketStringNodeGen; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketIntervalNodeGen; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketStringNodeGen; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import java.util.List; public class TruffleTimestampTimeBucketEntry extends TimestampTimeBucketEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return switch (args.get(0).type()) { case Rql2StringType ignored -> TimestampTimeBucketStringNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); case Rql2IntervalType ignored -> TimestampTimeBucketIntervalNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java index dca83b894..d0509a00d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampToUnixTimestampEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampToUnixTimestampEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampToUnixTimestampNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampToUnixTimestampNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java index ae63ba60f..0536bc0c6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.common.source.Exp; -import com.rawlabs.snapi.frontend.rql2.builtin.TimestampYearEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampYearEntry; +import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampYearNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package.TimestampYearNodeGen; import java.util.List; import scala.Tuple2; import scala.collection.immutable.ListMap; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java index fe848aa48..e58240761 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TryFlatMapEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryFlatMapEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableMapNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableMapNodeGen; import java.util.List; public class TruffleTryFlatMapEntry extends TryFlatMapEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableMapNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java index 9f9f0ede3..6fe7045a2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TryIsErrorEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryIsErrorEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableIsFailureNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableIsFailureNodeGen; import java.util.List; public class TruffleTryIsErrorEntry extends TryIsErrorEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableIsFailureNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java index cdbeae3a1..1526f0eab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TryIsSuccessEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryIsSuccessEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableIsSuccessNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableIsSuccessNodeGen; import java.util.List; public class TruffleTryIsSuccessEntry extends TryIsSuccessEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableIsSuccessNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java index aa527a069..ade025963 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TryTransformEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryTransformEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableMapNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableMapNodeGen; import java.util.List; public class TruffleTryTransformEntry extends TryTransformEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableMapNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java index 5b4c5a122..6dd6b26d7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java @@ -13,16 +13,16 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TryUnsafeGetEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryUnsafeGetEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableUnsafeGetNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable.TryableUnsafeGetNodeGen; import java.util.List; public class TruffleTryUnsafeGetEntry extends TryUnsafeGetEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return TryableUnsafeGetNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java index 70bd52142..a10c60a57 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java @@ -13,15 +13,15 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TypeCastEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeCastEntry; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; import java.util.List; public class TruffleTypeCastEntry extends TypeCastEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return args.get(1).exprNode(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java index 53b423492..f0d67c3d8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java @@ -13,18 +13,18 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TypeEmptyEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeEmptyEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.literals.ZeroedConstNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.ZeroedConstNode; import java.util.List; public class TruffleTypeEmptyEntry extends TypeEmptyEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { return new ZeroedConstNode((Rql2Type) args.getFirst().type()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java index 1391cab1f..9f2e46005 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java @@ -14,14 +14,14 @@ import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.rql2.TypesMerger; -import com.rawlabs.snapi.frontend.rql2.builtin.TypeMatchEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeMatchEntry; import com.rawlabs.snapi.frontend.rql2.source.FunType; import com.rawlabs.snapi.frontend.rql2.source.Rql2OrType; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package.TypeMatchNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package.TypeMatchNode; import java.util.Comparator; import java.util.List; @@ -31,7 +31,7 @@ public class TruffleTypeMatchEntry extends TypeMatchEntry implements TruffleEntr private record Handler(int idx, TruffleArg arg) {} - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { Rql2OrType orType = (Rql2OrType) args.get(0).type(); ExpressionNode[] handlers = args.stream() diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java index dceb9c28a..f93dfc71d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java @@ -13,15 +13,15 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.builtin.TypeProtectCastEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeProtectCastEntry; import com.rawlabs.snapi.frontend.rql2.source.*; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package.TypeProtectCastOptionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package.TypeProtectCastTryableNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package.TypeProtectCastOptionNode; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package.TypeProtectCastTryableNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import scala.collection.JavaConverters; import java.util.HashSet; @@ -30,7 +30,7 @@ public class TruffleTypeProtectCastEntry extends TypeProtectCastEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, RawLanguage rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { ExpType expSourceType = (ExpType) args.get(0).type(); ExpType expTargetType = (ExpType) args.get(1).type(); Type sourceType = expSourceType.t(); @@ -93,7 +93,7 @@ private Set extraProps(Type target, Type source) { finalProps.removeAll(targetProps); yield finalProps; } - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java index 7a8e57e88..2926649bd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.FrameSlotKind; import java.util.List; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.ParseXmlEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ParseXmlEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; @@ -25,13 +25,13 @@ import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromUnsafe; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlParseCollectionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlParseValueNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromUnsafe; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.TryableTopLevelWrapper; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.XmlParseCollectionNode; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.XmlParseValueNode; public class TruffleParseXmlEntry extends ParseXmlEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java index 1fe0e11c3..d3111986a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.frame.FrameSlotKind; import java.util.List; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.api.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.builtin.ReadXmlEntry; +import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; +import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ReadXmlEntry; import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; @@ -25,13 +25,13 @@ import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list.ListFromUnsafe; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.literals.StringNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.TryableTopLevelWrapper; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlReadCollectionNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.XmlReadValueNode; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromNode; +import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromUnsafe; +import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; +import com.rawlabs.snapi.truffle.ast.io.json.reader.TryableTopLevelWrapper; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.XmlReadCollectionNode; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.XmlReadValueNode; public class TruffleReadXmlEntry extends ReadXmlEntry implements TruffleEntryExtension { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java index 93e157c2d..e6a8acd52 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java @@ -14,12 +14,12 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.ExpressionNode; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramExpressionNode; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.option.OptionSomeNodeGen; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.ExpressionNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; +import com.rawlabs.snapi.truffle.ast.expressions.option.OptionSomeNodeGen; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import scala.collection.JavaConverters; import java.util.stream.Stream; @@ -41,17 +41,17 @@ private static ExpressionNode primitiveParserNode(Rql2TypeWithProperties tipe) { case Rql2DateType v -> DateParseXmlNodeGen.create(); case Rql2TimeType v -> TimeParseXmlNodeGen.create(); case Rql2TimestampType v -> TimestampParseXmlNodeGen.create(); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } - public static ProgramExpressionNode recurseXmlParser(Rql2TypeWithProperties tipe, RawLanguage lang) { + public static ProgramExpressionNode recurseXmlParser(Rql2TypeWithProperties tipe, Rql2Language lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramExpressionNode(lang, frameDescriptor, recurse(lang, frameDescriptor, tipe, "*")); } - private static ExpressionNode recurse(RawLanguage lang, FrameDescriptor frameDescriptor, Rql2TypeWithProperties tipe, String fieldName) { + private static ExpressionNode recurse(Rql2Language lang, FrameDescriptor frameDescriptor, Rql2TypeWithProperties tipe, String fieldName) { boolean isAttribute = fieldName.startsWith("@"); boolean isText = fieldName.equals("#text"); ExpressionNode parserNode; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CompilerScalaConsts.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CompilerScalaConsts.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java index a2908577b..e486c8452 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CompilerScalaConsts.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.output; +package com.rawlabs.snapi.truffle.emitter.writers; import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CsvWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CsvWriter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java index 95ab9df44..ddef2453b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/CsvWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.output; +package com.rawlabs.snapi.truffle.emitter.writers; import com.oracle.truffle.api.frame.FrameDescriptor; import java.util.Arrays; import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.io.csv.writer.internal.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; public class CsvWriter { - public static ProgramStatementNode getCsvWriter(Type[] args, RawLanguage lang) { + public static ProgramStatementNode getCsvWriter(Type[] args, Rql2Language lang) { ProgramStatementNode[] columnWriters = Arrays.stream(args) .map(arg -> columnWriter(arg, lang)) @@ -34,7 +34,7 @@ public static ProgramStatementNode getCsvWriter(Type[] args, RawLanguage lang) { return new ProgramStatementNode(lang, new FrameDescriptor(), recordWriter); } - private static StatementNode columnWriter(Type t, RawLanguage lang) { + private static StatementNode columnWriter(Type t, Rql2Language lang) { return switch (t){ case Rql2TypeWithProperties r when r.props().contains(CompilerScalaConsts.tryable) -> { StatementNode inner = columnWriter(r.cloneAndRemoveProp(CompilerScalaConsts.tryable), lang); @@ -60,14 +60,14 @@ yield switch (r){ case Rql2TimeType ignored -> new TimeWriteCsvNode(); case Rql2TimestampType ignored -> new TimestampWriteCsvNode(); case Rql2BinaryType ignored -> new BinaryWriteCsvNode(); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }; } - private static ProgramStatementNode program(StatementNode e, RawLanguage lang) { + private static ProgramStatementNode program(StatementNode e, Rql2Language lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramStatementNode(lang, frameDescriptor, e); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/JsonWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/JsonWriter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java index c9bf3f44e..bff9e26b8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/JsonWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.output; +package com.rawlabs.snapi.truffle.emitter.writers; import com.oracle.truffle.api.frame.FrameDescriptor; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.StatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.StatementNode; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.io.json.writer.internal.*; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import scala.collection.JavaConverters; -import static com.rawlabs.snapi.truffle.emitter.output.CompilerScalaConsts.nullable; -import static com.rawlabs.snapi.truffle.emitter.output.CompilerScalaConsts.tryable; +import static com.rawlabs.snapi.truffle.emitter.writers.CompilerScalaConsts.nullable; +import static com.rawlabs.snapi.truffle.emitter.writers.CompilerScalaConsts.tryable; public class JsonWriter { - public static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, RawLanguage lang) { + public static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, Rql2Language lang) { return recurse(tipe, false, lang); } - private static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, boolean isSafe, RawLanguage lang) { + private static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, boolean isSafe, Rql2Language lang) { return program(switch (tipe){ case Rql2TypeWithProperties nt when nt.props().contains(tryable) -> { Rql2TypeWithProperties nextType = (Rql2TypeWithProperties) nt.cloneAndRemoveProp(tryable); @@ -80,11 +80,11 @@ private static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, boolean yield new OrWriteJsonNode(children); } case Rql2UndefinedType ignored -> new UndefinedWriteJsonNode(); - default -> throw new RawTruffleInternalErrorException(); + default -> throw new TruffleInternalErrorException(); }, lang); } - private static ProgramStatementNode program(StatementNode e, RawLanguage lang) { + private static ProgramStatementNode program(StatementNode e, Rql2Language lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramStatementNode(lang, frameDescriptor, e); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/TruffleBinaryWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/TruffleBinaryWriter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java index c098a5f0d..8d9698926 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/output/TruffleBinaryWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.emitter.output; +package com.rawlabs.snapi.truffle.emitter.writers; import com.oracle.truffle.api.frame.FrameDescriptor; import com.rawlabs.snapi.frontend.rql2.source.Rql2BinaryType; import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; import com.rawlabs.snapi.frontend.rql2.source.Rql2StringType; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.ProgramStatementNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.binary.BinaryBytesWriterNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.binary.NullableBinaryWriterNode; -import com.rawlabs.snapi.truffle.runtime.ast.io.binary.TryableBinaryWriterNode; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; +import com.rawlabs.snapi.truffle.ast.io.binary.BinaryBytesWriterNode; +import com.rawlabs.snapi.truffle.ast.io.binary.NullableBinaryWriterNode; +import com.rawlabs.snapi.truffle.ast.io.binary.TryableBinaryWriterNode; public class TruffleBinaryWriter { public static ProgramStatementNode getBinaryWriterNode( - Rql2BinaryType type, RawLanguage lang, FrameDescriptor frameDescriptor) { + Rql2BinaryType type, Rql2Language lang, FrameDescriptor frameDescriptor) { if (type.props().isEmpty()) { return new ProgramStatementNode(lang, frameDescriptor, new BinaryBytesWriterNode()); } else if (type.props().contains(Rql2IsTryableTypeProperty.apply())) { @@ -47,7 +47,7 @@ public static ProgramStatementNode getBinaryWriterNode( } public static ProgramStatementNode getBinaryWriterNode( - Rql2StringType type, RawLanguage lang, FrameDescriptor frameDescriptor) { + Rql2StringType type, Rql2Language lang, FrameDescriptor frameDescriptor) { if (type.props().isEmpty()) { return new ProgramStatementNode(lang, frameDescriptor, new BinaryBytesWriterNode()); } else if (type.props().contains(Rql2IsTryableTypeProperty.apply())) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapIterator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapIterator.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapIterator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapIterator.java index 2c6eb81ff..767290cde 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapIterator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapIterator.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.data_structures.treemap; -import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.predecessor; -import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.successor; +import static com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapStatic.predecessor; +import static com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapStatic.successor; import java.util.ConcurrentModificationException; import java.util.NoSuchElementException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapNode.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNode.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapNode.java index 687b8c553..f5d786061 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapNode.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.data_structures.treemap; -import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.BLACK; +import static com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapStatic.BLACK; public class TreeMapNode { Object key; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapNodes.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapNodes.java index dd5d9a031..4ab1cbbd9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapNodes.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.data_structures.treemap; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.PropertyType; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.ast.PropertyType; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; import java.util.ArrayList; public class TreeMapNodes { @@ -24,7 +24,7 @@ public class TreeMapNodes { @NodeInfo(shortName = "TreeMap.GetOrCreate") @GenerateUncached @GenerateInline - @ImportStatic(com.rawlabs.snapi.truffle.runtime.PropertyType.class) + @ImportStatic(PropertyType.class) public abstract static class TreeMapGetOrCreate extends Node { public abstract Object execute(Node node, TreeMapObject mapObject, Object key); @@ -63,7 +63,7 @@ static Object exec( @NodeInfo(shortName = "TreeMap.GetOrCreateDistinct") @GenerateUncached @GenerateInline - @ImportStatic(com.rawlabs.snapi.truffle.runtime.PropertyType.class) + @ImportStatic(PropertyType.class) public abstract static class TreeMapGetOrCreateDistinct extends Node { public abstract boolean execute(Node node, TreeMapObject mapObject, Object key); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapObject.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapObject.java index eca28f3e3..42cd4b64d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.data_structures.treemap; -import static com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapStatic.*; +import static com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapStatic.*; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapStatic.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapStatic.java similarity index 95% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapStatic.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapStatic.java index c8e0cd1a5..2763ba3d7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/data_structures/treemap/TreeMapStatic.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/data_structures/treemap/TreeMapStatic.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; +package com.rawlabs.snapi.truffle.runtime.data_structures.treemap; public class TreeMapStatic { public static final boolean RED = false; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/BreakException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/BreakException.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/BreakException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/BreakException.java index 362b1953a..c2aeab810 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/BreakException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/BreakException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.exceptions; import com.oracle.truffle.api.nodes.ControlFlowException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/ReadLinesRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/ReadLinesTruffleException.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/ReadLinesRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/ReadLinesTruffleException.java index 9614bb77c..0cdec3f34 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/ReadLinesRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/ReadLinesTruffleException.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.exceptions; import com.oracle.truffle.api.nodes.Node; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; -public class ReadLinesRawTruffleException extends RawTruffleRuntimeException { - public ReadLinesRawTruffleException( +public class ReadLinesTruffleException extends TruffleRuntimeException { + public ReadLinesTruffleException( String message, TruffleCharInputStream stream, Throwable cause, Node location) { super(createMessage(message, stream), cause, location); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleInternalErrorException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleInternalErrorException.java similarity index 65% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleInternalErrorException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleInternalErrorException.java index 20fba1d44..7cf896353 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleInternalErrorException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleInternalErrorException.java @@ -10,36 +10,36 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.exceptions; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -// This exception is thrown when an internal error occurs in the Raw Truffle runtime. -public class RawTruffleInternalErrorException extends RuntimeException { +// This exception is thrown when an internal error occurs in the Truffle runtime. +public class TruffleInternalErrorException extends RuntimeException { @CompilerDirectives.TruffleBoundary - public RawTruffleInternalErrorException() { + public TruffleInternalErrorException() { super("internal error"); } @CompilerDirectives.TruffleBoundary - public RawTruffleInternalErrorException(String message) { + public TruffleInternalErrorException(String message) { super(message); } @CompilerDirectives.TruffleBoundary - public RawTruffleInternalErrorException(String message, Throwable cause) { + public TruffleInternalErrorException(String message, Throwable cause) { super(message, cause); } @CompilerDirectives.TruffleBoundary - public RawTruffleInternalErrorException(Throwable cause, Node location) { + public TruffleInternalErrorException(Throwable cause, Node location) { super(location.getDescription(), cause); } @CompilerDirectives.TruffleBoundary - public RawTruffleInternalErrorException(Throwable cause) { + public TruffleInternalErrorException(Throwable cause) { super(cause); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleRuntimeException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleRuntimeException.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleRuntimeException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleRuntimeException.java index 54ff3cc2a..ee0c956e6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleRuntimeException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleRuntimeException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.exceptions; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.exception.AbstractTruffleException; @@ -21,30 +21,30 @@ import com.oracle.truffle.api.nodes.Node; @ExportLibrary(InteropLibrary.class) -public class RawTruffleRuntimeException extends AbstractTruffleException { +public class TruffleRuntimeException extends AbstractTruffleException { @TruffleBoundary - public RawTruffleRuntimeException(String message) { + public TruffleRuntimeException(String message) { super(message); } @TruffleBoundary - public RawTruffleRuntimeException(String message, Throwable cause, Node location) { + public TruffleRuntimeException(String message, Throwable cause, Node location) { super(message, cause, UNLIMITED_STACK_TRACE, location); } @TruffleBoundary - public RawTruffleRuntimeException(String message, Node location) { + public TruffleRuntimeException(String message, Node location) { super(message, location); } @TruffleBoundary - public RawTruffleRuntimeException(String message, Throwable cause) { + public TruffleRuntimeException(String message, Throwable cause) { super(message, cause, UNLIMITED_STACK_TRACE, null); } @TruffleBoundary - public RawTruffleRuntimeException(Throwable cause, Node location) { + public TruffleRuntimeException(Throwable cause, Node location) { super(cause.toString(), cause, UNLIMITED_STACK_TRACE, location); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleUnexpectedNullException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleUnexpectedNullException.java similarity index 65% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleUnexpectedNullException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleUnexpectedNullException.java index 258624c36..bc4e6720c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleUnexpectedNullException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleUnexpectedNullException.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.exceptions; import com.oracle.truffle.api.nodes.Node; -public class RawTruffleUnexpectedNullException extends RawTruffleRuntimeException { +public class TruffleUnexpectedNullException extends TruffleRuntimeException { - public RawTruffleUnexpectedNullException(Node location) { + public TruffleUnexpectedNullException(Node location) { super("unexpected null value found", location); } - public RawTruffleUnexpectedNullException(Throwable cause, Node location) { + public TruffleUnexpectedNullException(Throwable cause, Node location) { super("unexpected null value found", cause, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleValidationException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleValidationException.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleValidationException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleValidationException.java index a53564ba7..2d63ad959 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/RawTruffleValidationException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/TruffleValidationException.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions; +package com.rawlabs.snapi.truffle.runtime.exceptions; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.exception.AbstractTruffleException; @@ -19,17 +19,17 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.rawlabs.compiler.Message; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation.ValidationErrorObject; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.exceptions.validation.ValidationErrorObject; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.List; @ExportLibrary(InteropLibrary.class) -public class RawTruffleValidationException extends AbstractTruffleException { +public class TruffleValidationException extends AbstractTruffleException { private final ValidationErrorObject errors; @TruffleBoundary - public RawTruffleValidationException(List errors) { + public TruffleValidationException(List errors) { super("validation failure"); this.errors = new ValidationErrorObject(errors); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonWriterRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/binary/BinaryWriterTruffleException.java similarity index 61% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonWriterRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/binary/BinaryWriterTruffleException.java index cc691aea1..26889b4a7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonWriterRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/binary/BinaryWriterTruffleException.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.binary; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class JsonWriterRawTruffleException extends RawTruffleRuntimeException { +public class BinaryWriterTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public JsonWriterRawTruffleException(String message, Node location) { + public BinaryWriterTruffleException(String message, Node location) { super(message, location); } @CompilerDirectives.TruffleBoundary - public JsonWriterRawTruffleException(String message, Throwable cause, Node location) { + public BinaryWriterTruffleException(String message, Throwable cause, Node location) { super(message, cause, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvExpectedNothingException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvExpectedNothingException.java similarity index 58% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvExpectedNothingException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvExpectedNothingException.java index 1297fc17d..316bc2b56 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvExpectedNothingException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvExpectedNothingException.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.exceptions.csv; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; -public class CsvExpectedNothingException extends CsvParserRawTruffleException { +public class CsvExpectedNothingException extends CsvParserTruffleException { public CsvExpectedNothingException( - String token, RawTruffleCsvParser p, RawTruffleCharStream stream, Node location) { + String token, TruffleCsvParser p, TruffleCharStream stream, Node location) { super(String.format("unexpected value found, token '%s'", token), p, stream, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvParserTruffleException.java similarity index 65% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvParserTruffleException.java index 2dae1f54f..a3b9ca19e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvParserTruffleException.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.exceptions.csv; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; -public class CsvParserRawTruffleException extends RawTruffleRuntimeException { +public class CsvParserTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException(Throwable cause, Node location) { + public CsvParserTruffleException(Throwable cause, Node location) { super(cause.getMessage(), cause, location); } @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException(int line, int column, Throwable cause, Node location) { + public CsvParserTruffleException(int line, int column, Throwable cause, Node location) { super( String.format( "failed to parse CSV (line %d, col %d), %s", line, column, cause.getMessage()), @@ -35,7 +35,7 @@ public CsvParserRawTruffleException(int line, int column, Throwable cause, Node } @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException( + public CsvParserTruffleException( String message, int line, int column, Throwable cause, Node location) { super( String.format("failed to parse CSV (line %d, col %d), %s", line, column, message), @@ -44,10 +44,10 @@ public CsvParserRawTruffleException( } @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException( + public CsvParserTruffleException( String message, - RawTruffleCsvParser p, - RawTruffleCharStream stream, + TruffleCsvParser p, + TruffleCharStream stream, Throwable cause, Node location) { super( @@ -59,8 +59,8 @@ public CsvParserRawTruffleException( } @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException( - String message, RawTruffleCsvParser p, RawTruffleCharStream stream, Node location) { + public CsvParserTruffleException( + String message, TruffleCsvParser p, TruffleCharStream stream, Node location) { super( String.format( "failed to parse CSV (%s: line %d, col %d), %s", @@ -69,8 +69,8 @@ public CsvParserRawTruffleException( } @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException( - String message, RawTruffleCsvParser p, Throwable cause, Node location) { + public CsvParserTruffleException( + String message, TruffleCsvParser p, Throwable cause, Node location) { super( String.format( "failed to parse CSV (line %d, col %d), %s", @@ -80,7 +80,7 @@ public CsvParserRawTruffleException( } @CompilerDirectives.TruffleBoundary - public CsvParserRawTruffleException(RawTruffleCsvParser p, Throwable cause, Node location) { + public CsvParserTruffleException(TruffleCsvParser p, Throwable cause, Node location) { this(cause.getMessage(), p.currentTokenLine(), p.currentTokenColumn(), cause, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvReaderTruffleException.java similarity index 62% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvReaderTruffleException.java index a237d9249..492ab6702 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvReaderTruffleException.java @@ -10,51 +10,51 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.exceptions.csv; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParser; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; -public class CsvReaderRawTruffleException extends RawTruffleRuntimeException { +public class CsvReaderTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public CsvReaderRawTruffleException( + public CsvReaderTruffleException( String message, - RawTruffleCsvParser parser, - RawTruffleCharStream stream, + TruffleCsvParser parser, + TruffleCharStream stream, Throwable cause, Node location) { super(createMessage(message, parser, stream), cause, location); } @CompilerDirectives.TruffleBoundary - public CsvReaderRawTruffleException( - String message, RawTruffleCsvParser parser, RawTruffleCharStream stream) { + public CsvReaderTruffleException( + String message, TruffleCsvParser parser, TruffleCharStream stream) { super(createMessage(message, parser, stream)); } @CompilerDirectives.TruffleBoundary - public CsvReaderRawTruffleException( - String message, RawTruffleCharStream stream, Throwable cause, Node location) { + public CsvReaderTruffleException( + String message, TruffleCharStream stream, Throwable cause, Node location) { super(message, cause, location); } @CompilerDirectives.TruffleBoundary - public CsvReaderRawTruffleException(RawTruffleCharStream stream, Throwable cause) { + public CsvReaderTruffleException(TruffleCharStream stream, Throwable cause) { super(createMessage(cause.getMessage(), null, stream), cause, null); } @CompilerDirectives.TruffleBoundary - public CsvReaderRawTruffleException(RawTruffleCharStream stream, Throwable cause, Node location) { + public CsvReaderTruffleException(TruffleCharStream stream, Throwable cause, Node location) { super(createMessage(cause.getMessage(), null, stream), cause, location); } @CompilerDirectives.TruffleBoundary private static String createMessage( - String message, RawTruffleCsvParser parser, RawTruffleCharStream stream) { + String message, TruffleCsvParser parser, TruffleCharStream stream) { StringBuilder sb = new StringBuilder(); sb.append("failed to read CSV"); if (parser != null) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvWriterRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvWriterTruffleException.java similarity index 64% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvWriterRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvWriterTruffleException.java index 4f2c789fb..8b480257c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/csv/CsvWriterRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/csv/CsvWriterTruffleException.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; +package com.rawlabs.snapi.truffle.runtime.exceptions.csv; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class CsvWriterRawTruffleException extends RawTruffleRuntimeException { +public class CsvWriterTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public CsvWriterRawTruffleException(String message, Throwable cause, Node location) { + public CsvWriterTruffleException(String message, Throwable cause, Node location) { super("failed to write CSV: " + message, cause, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonExpectedNothingException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonExpectedNothingException.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonExpectedNothingException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonExpectedNothingException.java index 9446dd51c..0fb511d4f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonExpectedNothingException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonExpectedNothingException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -public class JsonExpectedNothingException extends JsonParserRawTruffleException { +public class JsonExpectedNothingException extends JsonParserTruffleException { @CompilerDirectives.TruffleBoundary public JsonExpectedNothingException(String token) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonOrTypeException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonOrTypeException.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonOrTypeException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonOrTypeException.java index 923418e10..410a1d2f3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonOrTypeException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonOrTypeException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -public class JsonOrTypeException extends JsonParserRawTruffleException { +public class JsonOrTypeException extends JsonParserTruffleException { @TruffleBoundary public JsonOrTypeException(String[] messages, Throwable cause, Node location) { super(createMessage(messages), cause, location); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonParserTruffleException.java similarity index 58% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonParserTruffleException.java index 6e4ee8259..bd7dbd02a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonParserTruffleException.java @@ -10,26 +10,26 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class JsonParserRawTruffleException extends RawTruffleRuntimeException { +public class JsonParserTruffleException extends TruffleRuntimeException { @TruffleBoundary - public JsonParserRawTruffleException(String message) { + public JsonParserTruffleException(String message) { super(message); } @TruffleBoundary - public JsonParserRawTruffleException(String message, Throwable cause, Node location) { + public JsonParserTruffleException(String message, Throwable cause, Node location) { super(message, cause, location); } @TruffleBoundary - public JsonParserRawTruffleException(String message, Node location) { + public JsonParserTruffleException(String message, Node location) { super(message, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonReaderTruffleException.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonReaderTruffleException.java index e073bb540..9d206ada6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonReaderTruffleException.java @@ -10,33 +10,33 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; -public class JsonReaderRawTruffleException extends RawTruffleRuntimeException { +public class JsonReaderTruffleException extends TruffleRuntimeException { @TruffleBoundary - public JsonReaderRawTruffleException(String message, Throwable cause, Node location) { + public JsonReaderTruffleException(String message, Throwable cause, Node location) { super(message, cause, location); } @TruffleBoundary - public JsonReaderRawTruffleException(Throwable cause, Node location) { + public JsonReaderTruffleException(Throwable cause, Node location) { super("failed to read JSON", cause, location); } @TruffleBoundary - public JsonReaderRawTruffleException( + public JsonReaderTruffleException( JsonParser parser, TruffleCharInputStream stream, Throwable cause, Node location) { super(createMessage(cause.getCause().getMessage(), parser, stream), cause, location); } @TruffleBoundary - public JsonReaderRawTruffleException( + public JsonReaderTruffleException( String message, JsonParser parser, TruffleCharInputStream stream, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonRecordFieldNotFoundException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonRecordFieldNotFoundException.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonRecordFieldNotFoundException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonRecordFieldNotFoundException.java index 418429ad4..960aec754 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonRecordFieldNotFoundException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonRecordFieldNotFoundException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -public class JsonRecordFieldNotFoundException extends JsonParserRawTruffleException { +public class JsonRecordFieldNotFoundException extends JsonParserTruffleException { @TruffleBoundary public JsonRecordFieldNotFoundException(String fieldName, Node location) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonUnexpectedTokenException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonUnexpectedTokenException.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonUnexpectedTokenException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonUnexpectedTokenException.java index bf742988e..31b2bc532 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/json/JsonUnexpectedTokenException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonUnexpectedTokenException.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.nodes.Node; -public class JsonUnexpectedTokenException extends JsonParserRawTruffleException { +public class JsonUnexpectedTokenException extends JsonParserTruffleException { @TruffleBoundary public JsonUnexpectedTokenException( String expected, String actual, Throwable cause, Node location) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/binary/BinaryWriterRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonWriterTruffleException.java similarity index 60% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/binary/BinaryWriterRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonWriterTruffleException.java index 6d1ae5aa8..61c9970ad 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/binary/BinaryWriterRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/json/JsonWriterTruffleException.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.binary; +package com.rawlabs.snapi.truffle.runtime.exceptions.json; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class BinaryWriterRawTruffleException extends RawTruffleRuntimeException { +public class JsonWriterTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public BinaryWriterRawTruffleException(String message, Node location) { + public JsonWriterTruffleException(String message, Node location) { super(message, location); } @CompilerDirectives.TruffleBoundary - public BinaryWriterRawTruffleException(String message, Throwable cause, Node location) { + public JsonWriterTruffleException(String message, Throwable cause, Node location) { super(message, cause, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java new file mode 100644 index 000000000..f1f9d6f40 --- /dev/null +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcExceptionHandler.java @@ -0,0 +1,34 @@ +/* + * Copyright 2023 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; + +import com.oracle.truffle.api.nodes.Node; +import com.rawlabs.snapi.truffle.ast.io.jdbc.JdbcQuery; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import java.sql.SQLException; + +public class JdbcExceptionHandler { + + public TruffleRuntimeException rewrite(SQLException e, JdbcQuery rs, Node location) { + return new JdbcReaderTruffleException(e.getMessage(), rs, e, location); + } + + public TruffleRuntimeException columnParseError(SQLException e, String colName, Node location) { + return new JdbcParserTruffleException( + String.format("column '%s': %s", colName, e.getMessage()), e, location); + } + + public TruffleRuntimeException rewrite(SQLException e, JdbcQuery rs) { + return new JdbcReaderTruffleException(e.getMessage(), rs, e, null); + } +} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcParserTruffleException.java similarity index 64% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcParserTruffleException.java index 739e7078c..d962ac873 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcParserTruffleException.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class JdbcParserRawTruffleException extends RawTruffleRuntimeException { +public class JdbcParserTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public JdbcParserRawTruffleException(String message, Throwable e, Node location) { + public JdbcParserTruffleException(String message, Throwable e, Node location) { super(String.format("failed to read value: %s", message), e, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcReaderTruffleException.java similarity index 62% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcReaderTruffleException.java index 5aeb51ea2..307e0b27b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/JdbcReaderTruffleException.java @@ -10,17 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.JdbcQuery; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.ast.io.jdbc.JdbcQuery; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class JdbcReaderRawTruffleException extends RawTruffleRuntimeException { +public class JdbcReaderTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public JdbcReaderRawTruffleException(String message, JdbcQuery rs, Throwable e, Node location) { + public JdbcReaderTruffleException(String message, JdbcQuery rs, Throwable e, Node location) { super( String.format("failed to read from database %s: %s", rs.getPublicDescription(), message), e, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/MySQLExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/MySQLExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/MySQLExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/MySQLExceptionHandler.java index 229a52923..71b5a5180 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/MySQLExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/MySQLExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; public class MySQLExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/OracleExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/OracleExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/OracleExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/OracleExceptionHandler.java index 94a7305c7..de7591c47 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/OracleExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/OracleExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; public class OracleExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java index efbbf906e..526e29c02 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/PostgreSQLExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; public class PostgreSQLExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java index e6eddf045..b77ea2979 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/SnowflakeExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; public class SnowflakeExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SqlServerExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/SqlServerExceptionHandler.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SqlServerExceptionHandler.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/SqlServerExceptionHandler.java index 01ba4f3dc..79555743f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/SqlServerExceptionHandler.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/rdbms/SqlServerExceptionHandler.java @@ -10,6 +10,6 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; +package com.rawlabs.snapi.truffle.runtime.exceptions.rdbms; public class SqlServerExceptionHandler extends JdbcExceptionHandler {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorMessage.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorMessage.java similarity index 95% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorMessage.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorMessage.java index a20b164fd..b610e17ce 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorMessage.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorMessage.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorObject.java similarity index 96% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorObject.java index 9bf31663f..bc64a744a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorPosition.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorPosition.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorPosition.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorPosition.java index 12daa1928..9eb169390 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorPosition.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorPosition.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class ValidationErrorPosition implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorRange.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorRange.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorRange.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorRange.java index c4c4d3f8d..c3fd77663 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/validation/ValidationErrorRange.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/validation/ValidationErrorRange.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; +package com.rawlabs.snapi.truffle.runtime.exceptions.validation; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public class ValidationErrorRange implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlExpectedNothingException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlExpectedNothingException.java similarity index 65% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlExpectedNothingException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlExpectedNothingException.java index 110cfb564..d39d74ff3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlExpectedNothingException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlExpectedNothingException.java @@ -10,22 +10,22 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; -public class XmlExpectedNothingException extends XmlParserRawTruffleException { +public class XmlExpectedNothingException extends XmlParserTruffleException { @CompilerDirectives.TruffleBoundary public XmlExpectedNothingException( - String content, RawTruffleXmlParser parser, Throwable cause, Node location) { + String content, TruffleXmlParser parser, Throwable cause, Node location) { super(String.format("unexpected value found: '%s'", content), parser, cause, location); } @CompilerDirectives.TruffleBoundary - public XmlExpectedNothingException(String content, RawTruffleXmlParser parser, Node location) { + public XmlExpectedNothingException(String content, TruffleXmlParser parser, Node location) { super(String.format("unexpected value found: '%s'", content), parser, location); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlOrTypeParserException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlOrTypeParserException.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlOrTypeParserException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlOrTypeParserException.java index 481ca4c22..1901b2eef 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlOrTypeParserException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlOrTypeParserException.java @@ -10,24 +10,24 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; import java.util.List; -public class XmlOrTypeParserException extends XmlParserRawTruffleException { +public class XmlOrTypeParserException extends XmlParserTruffleException { @CompilerDirectives.TruffleBoundary public XmlOrTypeParserException( - List parseErrors, RawTruffleXmlParser parser, Throwable cause, Node location) { + List parseErrors, TruffleXmlParser parser, Throwable cause, Node location) { super(createMessage(parseErrors), parser, cause, location); } @CompilerDirectives.TruffleBoundary public XmlOrTypeParserException( - List parseErrors, RawTruffleXmlParser parser, Node location) { + List parseErrors, TruffleXmlParser parser, Node location) { super(createMessage(parseErrors), parser, location); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlParserRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlParserTruffleException.java similarity index 66% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlParserRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlParserTruffleException.java index 0a5c28263..9ef4a6905 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlParserRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlParserTruffleException.java @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; -public class XmlParserRawTruffleException extends RawTruffleRuntimeException { +public class XmlParserTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public XmlParserRawTruffleException( - String message, RawTruffleXmlParser parser, Throwable cause, Node location) { + public XmlParserTruffleException( + String message, TruffleXmlParser parser, Throwable cause, Node location) { super( String.format( "failed to parse XML (line %d column %d): %s", @@ -31,7 +31,7 @@ public XmlParserRawTruffleException( } @CompilerDirectives.TruffleBoundary - public XmlParserRawTruffleException(String message, RawTruffleXmlParser parser, Node location) { + public XmlParserTruffleException(String message, TruffleXmlParser parser, Node location) { super( String.format( "failed to parse XML (line %d column %d): %s", @@ -40,13 +40,13 @@ public XmlParserRawTruffleException(String message, RawTruffleXmlParser parser, } @CompilerDirectives.TruffleBoundary - public XmlParserRawTruffleException(Throwable cause, RawTruffleXmlParser parser) { + public XmlParserTruffleException(Throwable cause, TruffleXmlParser parser) { // TODO super(cause.getMessage(), cause, null); } @CompilerDirectives.TruffleBoundary - public XmlParserRawTruffleException(int line, int column, Throwable cause, Node location) { + public XmlParserTruffleException(int line, int column, Throwable cause, Node location) { super( String.format( "failed to parse XML (line %d column %d): %s", line, column, cause.getMessage()), @@ -55,7 +55,7 @@ public XmlParserRawTruffleException(int line, int column, Throwable cause, Node } @CompilerDirectives.TruffleBoundary - public XmlParserRawTruffleException( + public XmlParserTruffleException( String message, int line, int column, Throwable cause, Node location) { super( String.format("failed to parse XML (line %d column %d): %s", line, column, message), diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlReaderRawTruffleException.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlReaderTruffleException.java similarity index 60% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlReaderRawTruffleException.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlReaderTruffleException.java index 6485ec8bf..5521c5450 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/xml/XmlReaderRawTruffleException.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/exceptions/xml/XmlReaderTruffleException.java @@ -10,45 +10,45 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; +package com.rawlabs.snapi.truffle.runtime.exceptions.xml; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; -public class XmlReaderRawTruffleException extends RawTruffleRuntimeException { +public class XmlReaderTruffleException extends TruffleRuntimeException { @CompilerDirectives.TruffleBoundary - public XmlReaderRawTruffleException(String message, Throwable cause, Node location) { + public XmlReaderTruffleException(String message, Throwable cause, Node location) { super(message, cause, location); } @CompilerDirectives.TruffleBoundary - public XmlReaderRawTruffleException( - String message, RawTruffleCharStream stream, Throwable cause, Node location) { + public XmlReaderTruffleException( + String message, TruffleCharStream stream, Throwable cause, Node location) { super(createMessage(message, stream, null), cause, location); } @CompilerDirectives.TruffleBoundary - public XmlReaderRawTruffleException(String message, RawTruffleCharStream stream, Node location) { + public XmlReaderTruffleException(String message, TruffleCharStream stream, Node location) { super(createMessage(message, stream, null), location); } @CompilerDirectives.TruffleBoundary - public XmlReaderRawTruffleException(Throwable cause, RawTruffleCharStream stream, Node location) { + public XmlReaderTruffleException(Throwable cause, TruffleCharStream stream, Node location) { super(createMessage(cause.getMessage(), stream, null), cause, location); } @CompilerDirectives.TruffleBoundary - public XmlReaderRawTruffleException( - Throwable cause, RawTruffleXmlParser parser, RawTruffleCharStream stream, Node location) { + public XmlReaderTruffleException( + Throwable cause, TruffleXmlParser parser, TruffleCharStream stream, Node location) { super(createMessage(cause.getMessage(), stream, parser), cause, location); } private static String createMessage( - String customMessage, RawTruffleCharStream stream, RawTruffleXmlParser parser) { + String customMessage, TruffleCharStream stream, TruffleXmlParser parser) { StringBuilder builder = new StringBuilder("failed to read XML"); if (parser != null) { builder.append( diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Closure.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Closure.java similarity index 98% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Closure.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Closure.java index 0e93e7cdd..50c4969a4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Closure.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Closure.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; @@ -29,7 +29,7 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Function.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Function.java similarity index 95% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Function.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Function.java index f3626ec31..31ba24abc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Function.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Function.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionExecuteNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionExecuteNodes.java similarity index 98% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionExecuteNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionExecuteNodes.java index 1f65d26ba..5eed27e1c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionExecuteNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionExecuteNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RawFunctionRegistry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistry.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RawFunctionRegistry.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistry.java index f8abdc073..a48ee8bbe 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RawFunctionRegistry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistry.java @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.interop.TruffleObject; -public final class RawFunctionRegistry { +public final class FunctionRegistry { private final FunctionRegistryObject registry; - public RawFunctionRegistry() { + public FunctionRegistry() { registry = new FunctionRegistryObject(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionRegistryObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionRegistryObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java index 5c833c296..41392a1d1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/FunctionRegistryObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; @@ -18,8 +18,8 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.HashMap; import java.util.Map; @@ -65,7 +65,7 @@ final boolean hasLanguage() { @ExportMessage final Class> getLanguage() { - return RawLanguage.class; + return Rql2Language.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Lambda.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Lambda.java similarity index 98% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Lambda.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Lambda.java index 41be9c355..b1e93fedd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/Lambda.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/Lambda.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; @@ -25,7 +25,7 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.list.StringList; // A function runtime object that doesn't have any default arguments and doesn't capture any free // variables. diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RecClosure.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/RecClosure.java similarity index 98% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RecClosure.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/RecClosure.java index 6dd801ccd..0e3e49a03 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/function/RecClosure.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/RecClosure.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.function; +package com.rawlabs.snapi.truffle.runtime.function; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.RootCallTarget; @@ -29,7 +29,7 @@ import com.oracle.truffle.api.nodes.IndirectCallNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/GeneratorNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/GeneratorNodes.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/GeneratorNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/GeneratorNodes.java index ab93008a2..7ea5b4901 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/GeneratorNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/GeneratorNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection; +package com.rawlabs.snapi.truffle.runtime.generator.collection; import com.esotericsoftware.kryo.KryoException; import com.esotericsoftware.kryo.io.Input; @@ -19,25 +19,25 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.ComputeNextNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.InputBufferNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaperNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.list.ListGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapNode; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.ComputeNextNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer.InputBufferNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaperNodes; +import com.rawlabs.snapi.truffle.runtime.generator.list.ListGenerator; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.util.ArrayList; @@ -66,7 +66,7 @@ static Object next( } catch (BreakException e) { // case end of data generator.setTerminated(true); throw e; - } catch (RawTruffleRuntimeException e) { // case runtime exception + } catch (TruffleRuntimeException e) { // case runtime exception generator.setException(e); } } else if (generator.hasException()) { // if hasNext returned a runtime error @@ -307,7 +307,7 @@ static boolean hasNext( } catch (BreakException e) { generator.setTerminated(true); return false; - } catch (RawTruffleRuntimeException e) { // store the runtime error + } catch (TruffleRuntimeException e) { // store the runtime error generator.setException(e); } } @@ -479,7 +479,7 @@ static void init( new GroupByInputBuffer(generator.getOffHeapGroupByKey(), kryoBuffer); generator.addInputBuffer(buffer); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, thisNode); + throw new TruffleRuntimeException(e.getMessage(), e, thisNode); } }); } @@ -506,7 +506,7 @@ static void init( new OrderByInputBuffer(generator.getOffHeapGroupByKeys(), kryoBuffer); generator.addInputBuffer(buffer); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, thisNode); + throw new TruffleRuntimeException(e.getMessage(), e, thisNode); } }); } @@ -534,7 +534,7 @@ static void init( generator.getOffHeapDistinct().getKryoInputBufferSize())); generator.getHeadKeys().add(null); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, thisNode); + throw new TruffleRuntimeException(e.getMessage(), e, thisNode); } }); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/StaticInitializers.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java similarity index 69% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/StaticInitializers.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java index e618e7628..8a30d6911 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/StaticInitializers.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection; +package com.rawlabs.snapi.truffle.runtime.generator.collection; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; import com.rawlabs.snapi.truffle.runtime.utils.IOUtils; import com.rawlabs.utils.core.RawSettings; import java.io.File; @@ -37,14 +37,14 @@ public static void kryoWriteInt(Output kryoOutput, int size) { @CompilerDirectives.TruffleBoundary public static FileOutputStream getGroupByKeyNewDiskBuffer( OffHeapGroupByKey offHeapGroupByKey, Node node) { - RawSettings settings = RawContext.get(node).getSettings(); + RawSettings settings = Rql2Context.get(node).getSettings(); File file; file = IOUtils.getScratchFile("groupby.", ".kryo", settings).toFile(); offHeapGroupByKey.getSpilledBuffers().add(file); try { return new FileOutputStream(file); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e, node); + throw new TruffleRuntimeException(e, node); } } @@ -52,26 +52,26 @@ public static FileOutputStream getGroupByKeyNewDiskBuffer( public static FileOutputStream groupByKeysNextFile( OffHeapGroupByKeys offHeapGroupByKeys, Node node) { File file; - RawSettings settings = RawContext.get(node).getSettings(); + RawSettings settings = Rql2Context.get(node).getSettings(); file = IOUtils.getScratchFile("orderby.", ".kryo", settings).toFile(); offHeapGroupByKeys.getSpilledBuffers().add(file); try { return new FileOutputStream(file); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e, node); + throw new TruffleRuntimeException(e, node); } } @CompilerDirectives.TruffleBoundary public static FileOutputStream distinctNextFile(OffHeapDistinct offHeapDistinct, Node node) { File file; - RawSettings settings = RawContext.get(node).getSettings(); + RawSettings settings = Rql2Context.get(node).getSettings(); file = IOUtils.getScratchFile("distinct.", ".kryo", settings).toFile(); offHeapDistinct.getSpilledBuffers().add(file); try { return new FileOutputStream(file); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e, node); + throw new TruffleRuntimeException(e, node); } } @@ -82,12 +82,12 @@ public static void kryoOutputClose(Output kryoOutput) { public static int getKryoOutputBufferSize(Node node) { return (int) - RawContext.get(node).getSettings().getMemorySize("raw.runtime.kryo.output-buffer-size"); + Rql2Context.get(node).getSettings().getMemorySize("raw.runtime.kryo.output-buffer-size"); } @CompilerDirectives.TruffleBoundary public static long[] getContextValues(Node node) { - RawSettings rawSettings = RawContext.get(node).getSettings(); + RawSettings rawSettings = Rql2Context.get(node).getSettings(); long[] contextValues = new long[3]; contextValues[0] = rawSettings.getMemorySize("raw.runtime.external.disk-block-max-size"); contextValues[1] = getKryoOutputBufferSize(node); @@ -97,21 +97,21 @@ public static long[] getContextValues(Node node) { @CompilerDirectives.TruffleBoundary public static RawSettings getRawSettings(Node node) { - return RawContext.get(node).getSettings(); + return Rql2Context.get(node).getSettings(); } @CompilerDirectives.TruffleBoundary - public static RawContext getRawContext(Node node) { - return RawContext.get(node); + public static Rql2Context getRql2Context(Node node) { + return Rql2Context.get(node); } @CompilerDirectives.TruffleBoundary public static OutputStream getOutputStream(Node node) { - return RawContext.get(node).getOutput(); + return Rql2Context.get(node).getOutput(); } @CompilerDirectives.TruffleBoundary public static String[] getScopes(Node node) { - return RawContext.get(node).getScopes(); + return Rql2Context.get(node).getScopes(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/AbstractGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/AbstractGenerator.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/AbstractGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/AbstractGenerator.java index b1f207af0..558c117cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/AbstractGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/AbstractGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.Objects; @ExportLibrary(InteropLibrary.class) @@ -35,7 +35,7 @@ public class AbstractGenerator implements TruffleObject { private boolean isTerminated = false; - private RawTruffleRuntimeException exception = null; + private TruffleRuntimeException exception = null; public AbstractGenerator(Object computeNext) { this.nextGenerator = computeNext; @@ -61,11 +61,11 @@ public void setNext(Object next) { this.next = next; } - public RawTruffleRuntimeException getException() { + public TruffleRuntimeException getException() { return exception; } - public void setException(RawTruffleRuntimeException exception) { + public void setException(TruffleRuntimeException exception) { this.exception = exception; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java index 07144b2ef..737f58188 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; @@ -24,38 +24,38 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.RawContext; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.CsvParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.JsonParserNodes; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.*; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRCollectionFilterConditionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRFromBodyConditionNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv.CsvReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json.JsonReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlParserRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml.XmlReaderRawTruffleException; -import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionExecuteNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.*; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.*; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.EmptyCollection; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.CsvParserNodes; +import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.*; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRCollectionFilterConditionNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRFromBodyConditionNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.json.JsonReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlReaderTruffleException; +import com.rawlabs.snapi.truffle.runtime.function.FunctionExecuteNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.*; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.*; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.EmptyCollection; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.snapi.truffle.runtime.utils.IOUtils; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import com.rawlabs.snapi.truffle.runtime.utils.TruffleInputStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleStringCharStream; import com.rawlabs.utils.core.RawSettings; import java.io.File; import java.io.FileInputStream; @@ -91,10 +91,9 @@ static Object next( } try { return rowParser.call(computeNext.getParser()); - } catch (CsvParserRawTruffleException e) { + } catch (CsvParserTruffleException e) { // wrap any error with the stream location - throw new CsvReaderRawTruffleException( - e.getMessage(), computeNext.getStream(), e, thisNode); + throw new CsvReaderTruffleException(e.getMessage(), computeNext.getStream(), e, thisNode); } } @@ -112,10 +111,9 @@ static Object next( } try { return rowParser.call(computeNext.getParser()); - } catch (CsvParserRawTruffleException e) { + } catch (CsvParserTruffleException e) { // wrap any error with the stream location - throw new CsvReaderRawTruffleException( - e.getMessage(), computeNext.getStream(), e, thisNode); + throw new CsvReaderTruffleException(e.getMessage(), computeNext.getStream(), e, thisNode); } } @@ -157,8 +155,8 @@ static Object next( } else { throw new BreakException(); } - } catch (JsonReaderRawTruffleException e) { - throw new JsonReaderRawTruffleException( + } catch (JsonReaderTruffleException e) { + throw new JsonReaderTruffleException( computeNext.getParser(), computeNext.getStream(), e, thisNode); } } @@ -240,8 +238,8 @@ static Object next( } else { try { return parseNextCallNode.call(computeNext.getParser()); - } catch (XmlParserRawTruffleException e) { - throw new XmlReaderRawTruffleException(e, computeNext.getStream(), null); + } catch (XmlParserTruffleException e) { + throw new XmlReaderTruffleException(e, computeNext.getStream(), null); } } } @@ -359,8 +357,8 @@ static Object next( return next; } - public static RawLanguage getRawLanguage(Node node) { - return RawLanguage.get(node); + public static Rql2Language getRql2Language(Node node) { + return Rql2Language.get(node); } @Specialization @@ -368,7 +366,7 @@ static Object next( Node node, ZipComputeNext computeNext, @Bind("$node") Node thisNode, - @Cached(value = "getRawLanguage(thisNode)", allowUncached = true) RawLanguage language, + @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, @Cached @Cached.Exclusive GeneratorNodes.GeneratorHasNextNode hasNextNode1, @Cached @Cached.Exclusive GeneratorNodes.GeneratorHasNextNode hasNextNode2, @Cached(inline = false) @Cached.Exclusive GeneratorNodes.GeneratorNextNode nextNode1, @@ -454,7 +452,7 @@ private static Input createInput(File file, Node node) { try { return new Input(new FileInputStream(file)); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, node); + throw new TruffleRuntimeException(e.getMessage(), e, node); } } @@ -514,7 +512,7 @@ static void init( new TruffleCharInputStream(truffleInputStream, computeNext.getEncoding())); computeNext.setParser( initParser.execute(thisNode, computeNext.getStream(), computeNext.getSettings())); - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { closeParser.execute(thisNode, computeNext.getParser()); throw ex; } @@ -531,13 +529,13 @@ static void init( try { computeNext.setParser( initParser.execute(thisNode, computeNext.getStream(), computeNext.getSettings())); - } catch (CsvReaderRawTruffleException ex) { - CsvReaderRawTruffleException newEx = - new CsvReaderRawTruffleException( + } catch (CsvReaderTruffleException ex) { + CsvReaderTruffleException newEx = + new CsvReaderTruffleException( ex.getMessage(), computeNext.getStream(), ex.getCause(), thisNode); closeParser.execute(thisNode, computeNext.getParser()); throw newEx; - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { closeParser.execute(thisNode, computeNext.getParser()); throw ex; } @@ -570,13 +568,13 @@ static void init( nextToken.execute(thisNode, computeNext.getParser()); // the first token is START_ARRAY so skip it nextToken.execute(thisNode, computeNext.getParser()); - } catch (JsonReaderRawTruffleException ex) { - JsonReaderRawTruffleException newEx = - new JsonReaderRawTruffleException( + } catch (JsonReaderTruffleException ex) { + JsonReaderTruffleException newEx = + new JsonReaderTruffleException( ex.getMessage(), computeNext.getParser(), computeNext.getStream(), ex, thisNode); closeParser.execute(thisNode, computeNext.getParser()); throw newEx; - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { closeParser.execute(thisNode, computeNext.getParser()); throw ex; } @@ -599,13 +597,13 @@ static void init(Node node, UnionComputeNext computeNext) {} @Specialization static void init(Node node, XmlParseComputeNext computeNext) { try { - computeNext.setStream(new RawTruffleStringCharStream(computeNext.getText())); + computeNext.setStream(new TruffleStringCharStream(computeNext.getText())); computeNext.setParser( - RawTruffleXmlParser.create(computeNext.getStream(), computeNext.getSettings())); + TruffleXmlParser.create(computeNext.getStream(), computeNext.getSettings())); // move from null to the first token int token = computeNext.getParser().nextToken(); // consume START_OBJECT computeNext.getParser().assertCurrentTokenIsStartTag(); // because it's the top level object - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { if (computeNext.getParser() != null) computeNext.getParser().close(); throw ex; } @@ -619,11 +617,11 @@ static void init(Node node, XmlReadComputeNext computeNext) { computeNext.setStream( new TruffleCharInputStream(truffleInputStream, computeNext.getEncoding())); computeNext.setParser( - RawTruffleXmlParser.create(computeNext.getStream(), computeNext.getSettings())); + TruffleXmlParser.create(computeNext.getStream(), computeNext.getSettings())); // move from null to the first token int token = computeNext.getParser().nextToken(); // consume START_OBJECT computeNext.getParser().assertCurrentTokenIsStartTag(); // because it's the top level object - } catch (RawTruffleRuntimeException ex) { + } catch (TruffleRuntimeException ex) { if (computeNext.getParser() != null) computeNext.getParser().close(); throw ex; } @@ -775,7 +773,7 @@ private static Output createOutput(JoinComputeNext computeNext, Node node) { new FileOutputStream(computeNext.getDiskRight()), computeNext.getKryoOutputBufferSize()); } catch (FileNotFoundException e) { - throw new RawTruffleRuntimeException(e.getMessage(), e, node); + throw new TruffleRuntimeException(e.getMessage(), e, node); } } @@ -805,7 +803,7 @@ static void init( @Cached(inline = false) @Cached.Shared("init") GeneratorNodes.GeneratorInitNode initNode, @Cached @Cached.Shared("close1") GeneratorNodes.GeneratorCloseNode closeNode) { - RawSettings settings = RawContext.get(thisNode).getSettings(); + RawSettings settings = Rql2Context.get(thisNode).getSettings(); computeNext.setDiskRight(IOUtils.getScratchFile("cartesian.", ".kryo", settings).toFile()); // save right to disk diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java index a3786a332..a19cf4f8e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; import com.oracle.truffle.api.frame.MaterializedFrame; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java index fccf32a35..b04e36ab3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/FilterComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; import com.oracle.truffle.api.frame.MaterializedFrame; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java index a7b40454c..4c8c9dc10 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java index 80b94652d..1784a295e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TakeComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; public class TakeComputeNext { private final Object parent; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java index 0b517112e..bdea3c00d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/TransformComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; public class TransformComputeNext { final Object parent; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java index b963b6e3e..9aec4ed6c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/UnnestComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; public class UnnestComputeNext { final Object parent; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java index b8d6cfd78..b9b9a52d2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/ZipComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; public class ZipComputeNext { private final Object parent1; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java similarity index 68% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java index e0e27faee..4f9f25aee 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadComputeNext.java @@ -10,27 +10,27 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParser; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class CsvReadComputeNext { private final LocationObject location; private final RootCallTarget rowParserCallTarget; private final String encoding; - private final RawTruffleCsvParserSettings settings; + private final TruffleCsvParserSettings settings; private TruffleCharInputStream stream; - private RawTruffleCsvParser parser; + private TruffleCsvParser parser; public CsvReadComputeNext( LocationObject location, RootCallTarget rowParserCallTarget, String encoding, - RawTruffleCsvParserSettings settings) { + TruffleCsvParserSettings settings) { this.location = location; this.rowParserCallTarget = rowParserCallTarget; this.encoding = encoding; @@ -41,7 +41,7 @@ public void setStream(TruffleCharInputStream stream) { this.stream = stream; } - public void setParser(RawTruffleCsvParser parser) { + public void setParser(TruffleCsvParser parser) { this.parser = parser; } @@ -57,7 +57,7 @@ public String getEncoding() { return encoding; } - public RawTruffleCsvParserSettings getSettings() { + public TruffleCsvParserSettings getSettings() { return settings; } @@ -65,7 +65,7 @@ public TruffleCharInputStream getStream() { return stream; } - public RawTruffleCsvParser getParser() { + public TruffleCsvParser getParser() { return parser; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java new file mode 100644 index 000000000..9f89b57eb --- /dev/null +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java @@ -0,0 +1,53 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; + +import com.oracle.truffle.api.RootCallTarget; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParser; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharStream; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleStringCharStream; + +public class CsvReadFromStringComputeNext { + private final TruffleCharStream stream; + private final RootCallTarget rowParserCallTarget; + private final TruffleCsvParserSettings settings; + private TruffleCsvParser parser; + + public CsvReadFromStringComputeNext( + String str, RootCallTarget rowParserCallTarget, TruffleCsvParserSettings settings) { + this.rowParserCallTarget = rowParserCallTarget; + this.settings = settings; + this.stream = new TruffleStringCharStream(str); + } + + public void setParser(TruffleCsvParser parser) { + this.parser = parser; + } + + public TruffleCharStream getStream() { + return stream; + } + + public RootCallTarget getRowParserCallTarget() { + return rowParserCallTarget; + } + + public TruffleCsvParserSettings getSettings() { + return settings; + } + + public TruffleCsvParser getParser() { + return parser; + } +} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java index a403b8c42..475e2b991 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/EmptyComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; public class EmptyComputeNext { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java index c1dad974b..476735071 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ExpressionComputeNext.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; public class ExpressionComputeNext { private final Object[] values; @@ -42,8 +42,8 @@ public Object next() { } try { return this.getCurrent(); - } catch (RawTruffleRuntimeException e) { - return new RawTruffleRuntimeException(e.getMessage(), e, null); + } catch (TruffleRuntimeException e) { + return new TruffleRuntimeException(e.getMessage(), e, null); } finally { this.incrementPosition(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java index c10e52c5f..7e5d551f7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/IntRangeComputeNext.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import static java.lang.Math.addExact; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; public class IntRangeComputeNext { private final int end; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java index 6b2a724b5..c033b29e3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JdbcQueryComputeNext.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.JdbcQuery; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.io.jdbc.JdbcQuery; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; public class JdbcQueryComputeNext { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java index 67cd6dbf5..a33d282e3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/JsonReadComputeNext.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.fasterxml.jackson.core.JsonParser; import com.oracle.truffle.api.RootCallTarget; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class JsonReadComputeNext { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java index 783831159..f17a035b2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/LongRangeComputeNext.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import static java.lang.Math.addExact; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; public class LongRangeComputeNext { private final long end; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java index 15ef9af6b..36fc75b4a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/ReadLinesComputeNext.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.ReadLinesRawTruffleException; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.exceptions.ReadLinesTruffleException; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; import java.io.BufferedReader; import java.io.IOException; @@ -54,7 +54,7 @@ private String readLine() { try { return this.reader.readLine(); } catch (IOException e) { - throw new ReadLinesRawTruffleException(e.getMessage(), stream, e, null); + throw new ReadLinesTruffleException(e.getMessage(), stream, e, null); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java similarity index 81% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java index 9809e05a6..66ab81138 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/TimestampRangeComputeNext.java @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.BreakException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.exceptions.BreakException; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; import java.time.LocalDateTime; public class TimestampRangeComputeNext { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java index ad8c6f1c2..3d1b6eadb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/UnionComputeNext.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; public class UnionComputeNext { private final Object[] inputs; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java similarity index 53% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java index 3d8b8fffc..41f25e96a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlParseComputeNext.java @@ -10,33 +10,33 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.utils.TruffleStringCharStream; public class XmlParseComputeNext { private final String text; protected final RootCallTarget parseNextRootCallTarget; - private final RawTruffleXmlParserSettings settings; - private RawTruffleXmlParser parser; + private final TruffleXmlParserSettings settings; + private TruffleXmlParser parser; - private RawTruffleStringCharStream stream; + private TruffleStringCharStream stream; public XmlParseComputeNext( - String text, RootCallTarget parseNextRootCallTarget, RawTruffleXmlParserSettings settings) { + String text, RootCallTarget parseNextRootCallTarget, TruffleXmlParserSettings settings) { this.text = text; this.settings = settings; this.parseNextRootCallTarget = parseNextRootCallTarget; } - public void setParser(RawTruffleXmlParser parser) { + public void setParser(TruffleXmlParser parser) { this.parser = parser; } - public void setStream(RawTruffleStringCharStream stream) { + public void setStream(TruffleStringCharStream stream) { this.stream = stream; } @@ -44,11 +44,11 @@ public RootCallTarget getParseNextRootCallTarget() { return parseNextRootCallTarget; } - public RawTruffleXmlParser getParser() { + public TruffleXmlParser getParser() { return parser; } - public RawTruffleStringCharStream getStream() { + public TruffleStringCharStream getStream() { return stream; } @@ -56,7 +56,7 @@ public String getText() { return text; } - public RawTruffleXmlParserSettings getSettings() { + public TruffleXmlParserSettings getSettings() { return settings; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java similarity index 69% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java index 52f90944c..a92d90467 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/sources/XmlReadComputeNext.java @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; +package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources; import com.oracle.truffle.api.RootCallTarget; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParser; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; public class XmlReadComputeNext { private final LocationObject locationObject; protected final RootCallTarget parseNextRootCallTarget; private final String encoding; - private RawTruffleXmlParser parser; - private final RawTruffleXmlParserSettings settings; + private TruffleXmlParser parser; + private final TruffleXmlParserSettings settings; private TruffleCharInputStream stream; @@ -31,14 +31,14 @@ public XmlReadComputeNext( LocationObject locationObject, String encoding, RootCallTarget parseNextRootCallTarget, - RawTruffleXmlParserSettings settings) { + TruffleXmlParserSettings settings) { this.encoding = encoding; this.settings = settings; this.locationObject = locationObject; this.parseNextRootCallTarget = parseNextRootCallTarget; } - public void setParser(RawTruffleXmlParser parser) { + public void setParser(TruffleXmlParser parser) { this.parser = parser; } @@ -58,11 +58,11 @@ public String getEncoding() { return encoding; } - public RawTruffleXmlParser getParser() { + public TruffleXmlParser getParser() { return parser; } - public RawTruffleXmlParserSettings getSettings() { + public TruffleXmlParserSettings getSettings() { return settings; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java index d8ce2d51f..eee6a4ddf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/GroupByInputBuffer.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; public class GroupByInputBuffer { private final OffHeapGroupByKey offHeapGroupByKey; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java index 07fb651b0..0ae00517b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; public class InputBufferNodes { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java index d5df52437..e4a57ca14 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/OrderByInputBuffer.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; public class OrderByInputBuffer { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java index 24c16e1d5..eb354ce17 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/OffHeapNodes.java @@ -10,28 +10,28 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap; -import static com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers.*; +import static com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers.*; import com.esotericsoftware.kryo.io.Output; import com.esotericsoftware.kryo.unsafe.UnsafeOutput; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapNode; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.kryo.KryoNodes; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapNode; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.DistinctSpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.GroupBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderByMemoryGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OrderBySpilledFilesGenerator; +import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; import java.util.ArrayList; public class OffHeapNodes { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java index 4665894f0..42524ee28 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctMemoryGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.Objects; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java index 3670acb15..9f12249fa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/DistinctSpilledFilesGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.dsl.Bind; @@ -22,8 +22,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java index 6837180b6..e5f4842ab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.oracle.truffle.api.frame.MaterializedFrame; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapObject; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapObject; import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; import java.util.ArrayList; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java index 7d21d4600..7c213e02e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupByMemoryGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.Objects; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java index e538bce48..89996c588 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/GroupBySpilledFilesGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer.GroupByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java index 2704c564e..bdfb944ad 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapObject; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapObject; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; import java.util.ArrayList; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java index 5889c126c..7b3cf116d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapObject; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapObject; import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; import java.util.ArrayList; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java index 8d119663f..8fc75fab0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderByMemoryGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap.TreeMapIterator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapIterator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.Iterator; import java.util.Objects; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java index 7ddb814a4..db49acd99 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OrderBySpilledFilesGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,9 +21,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.input_buffer.OrderByInputBuffer; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.ArrayList; import java.util.Objects; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java index 8ba5f343f..d1ef385e1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaper.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper; public class RecordShaper { private final boolean forList; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java index c7b0c5a10..169c8895c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper; +package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; public class RecordShaperNodes { @NodeInfo(shortName = "RecordShaper.MakeRow") @@ -27,8 +27,8 @@ public abstract static class MakeRowNode extends Node { public abstract Object execute(Node node, Object shaper, Object key, Object[] values); - public static RawLanguage getRawLanguage(Node node) { - return RawLanguage.get(node); + public static Rql2Language getRql2Language(Node node) { + return Rql2Language.get(node); } @Specialization(guards = {"shaper != null", "!shaper.forList()"}) @@ -38,7 +38,7 @@ static Object makeRowCollection( Object key, Object[] values, @Bind("$node") Node thisNode, - @Cached(value = "getRawLanguage(thisNode)", allowUncached = true) RawLanguage language, + @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode1, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode2) { Object record = language.createPureRecord(); @@ -55,7 +55,7 @@ static Object makeRowList( Object key, Object[] values, @Bind("$node") Node thisNode, - @Cached(value = "getRawLanguage(thisNode)", allowUncached = true) RawLanguage language, + @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode1, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode2) { Object record = language.createPureRecord(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/list/ListGenerator.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/list/ListGenerator.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/list/ListGenerator.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/list/ListGenerator.java index d553e7007..bda389931 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/list/ListGenerator.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/list/ListGenerator.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.generator.list; +package com.rawlabs.snapi.truffle.runtime.generator.list; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,8 +21,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.Objects; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/IterableNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/IterableNodes.java similarity index 88% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/IterableNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/IterableNodes.java index 8c67161c0..ab7cd0d91 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/IterableNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/IterableNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable; +package com.rawlabs.snapi.truffle.runtime.iterable; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.*; @@ -19,23 +19,23 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ast.osr.OSRGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRCollectionEquiJoinInitBodyNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSRDistinctGetGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.bodies.OSROrderByGetGeneratorNode; -import com.rawlabs.snapi.truffle.runtime.ast.osr.conditions.OSRHasNextConditionNode; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.StaticInitializers; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.*; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations.*; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources.*; +import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRCollectionEquiJoinInitBodyNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRDistinctGetGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.bodies.OSROrderByGetGeneratorNode; +import com.rawlabs.snapi.truffle.ast.osr.conditions.OSRHasNextConditionNode; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.*; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.OffHeapNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by.OffHeapGroupByKeys; +import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.operations.*; +import com.rawlabs.snapi.truffle.runtime.iterable.sources.*; public class IterableNodes { @NodeInfo(shortName = "Iterable.GetGenerator") diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/list/ListIterable.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/list/ListIterable.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/list/ListIterable.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/list/ListIterable.java index 490c1455b..f08d7da83 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/list/ListIterable.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/list/ListIterable.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.list; +package com.rawlabs.snapi.truffle.runtime.iterable.list; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.list.ListGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.list.ListGenerator; @ExportLibrary(InteropLibrary.class) public class ListIterable implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/DistinctCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/DistinctCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java index 86210bf1d..8a9c3e820 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/DistinctCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,8 +21,8 @@ import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class DistinctCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/EquiJoinCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/EquiJoinCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java index ba460a9c9..5d78e80ce 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/EquiJoinCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,10 +21,10 @@ import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class EquiJoinCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/FilterCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/FilterCollection.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/FilterCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/FilterCollection.java index 437c2a434..31c452525 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/FilterCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/FilterCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -20,8 +20,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class FilterCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/GroupByCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/GroupByCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java index 48aa0f8ab..e72e15f3b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/GroupByCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,8 +21,8 @@ import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class GroupByCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/JoinCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/JoinCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java index f9c85afe8..09534b3fe 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/JoinCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,10 +21,10 @@ import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class JoinCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/OrderByCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/OrderByCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java index 32997c82a..b8a1f0a62 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/OrderByCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -21,8 +21,8 @@ import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class OrderByCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TakeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/TakeCollection.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TakeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/TakeCollection.java index a3d47771f..6da3b7716 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TakeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/TakeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class TakeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TransformCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/TransformCollection.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TransformCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/TransformCollection.java index 25596ee09..e83b5a4cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/TransformCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/TransformCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class TransformCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/UnnestCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/UnnestCollection.java similarity index 87% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/UnnestCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/UnnestCollection.java index 2d996fd87..51be16105 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/UnnestCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/UnnestCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,8 +19,8 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class UnnestCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/ZipCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java similarity index 80% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/ZipCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java index 4c3ab6592..cf416936d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/operations/ZipCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; +package com.rawlabs.snapi.truffle.runtime.iterable.operations; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,16 +19,16 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class ZipCollection implements TruffleObject { final Object parentIterable1; final Object parentIterable2; - public ZipCollection(Object iterable1, Object iterable2, RawLanguage language) { + public ZipCollection(Object iterable1, Object iterable2, Rql2Language language) { this.parentIterable1 = iterable1; this.parentIterable2 = iterable2; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/CsvCollection.java similarity index 72% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/CsvCollection.java index 610690619..d12c9f7a9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/CsvCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,24 +20,24 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadComputeNext; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @ExportLibrary(InteropLibrary.class) public class CsvCollection implements TruffleObject { private final LocationObject location; private final RootCallTarget rowParserCallTarget; private final String encoding; - private final RawTruffleCsvParserSettings settings; + private final TruffleCsvParserSettings settings; public CsvCollection( LocationObject location, RootCallTarget rowParserCallTarget, String encoding, - RawTruffleCsvParserSettings settings) { + TruffleCsvParserSettings settings) { this.location = location; this.rowParserCallTarget = rowParserCallTarget; this.encoding = encoding; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvFromStringCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/CsvFromStringCollection.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvFromStringCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/CsvFromStringCollection.java index a542bf9e2..67a50f48f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/CsvFromStringCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/CsvFromStringCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,20 +20,20 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadFromStringComputeNext; +import com.rawlabs.snapi.truffle.ast.io.csv.reader.parser.TruffleCsvParserSettings; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.CsvReadFromStringComputeNext; @ExportLibrary(InteropLibrary.class) public class CsvFromStringCollection implements TruffleObject { private final String str; private final RootCallTarget rowParserCallTarget; - private final RawTruffleCsvParserSettings settings; + private final TruffleCsvParserSettings settings; public CsvFromStringCollection( - String str, RootCallTarget rowParserCallTarget, RawTruffleCsvParserSettings settings) { + String str, RootCallTarget rowParserCallTarget, TruffleCsvParserSettings settings) { this.str = str; this.rowParserCallTarget = rowParserCallTarget; this.settings = settings; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/EmptyCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/EmptyCollection.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/EmptyCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/EmptyCollection.java index 5bf72dd19..9f401c712 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/EmptyCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/EmptyCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.EmptyComputeNext; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.EmptyComputeNext; @ExportLibrary(InteropLibrary.class) public class EmptyCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ExpressionCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/ExpressionCollection.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ExpressionCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/ExpressionCollection.java index 92b814945..15ca95c6f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ExpressionCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/ExpressionCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; @ExportLibrary(InteropLibrary.class) public class ExpressionCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/IntRangeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/IntRangeCollection.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/IntRangeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/IntRangeCollection.java index df5dbcfd4..6f8104645 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/IntRangeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/IntRangeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.IntRangeComputeNext; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.IntRangeComputeNext; @ExportLibrary(InteropLibrary.class) public class IntRangeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JdbcQueryCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/JdbcQueryCollection.java similarity index 78% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JdbcQueryCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/JdbcQueryCollection.java index 55cd1d293..e1b05b290 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JdbcQueryCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/JdbcQueryCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,11 +20,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms.JdbcExceptionHandler; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.JdbcQueryComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.JdbcQueryComputeNext; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JsonReadCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/JsonReadCollection.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JsonReadCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/JsonReadCollection.java index e198c1bcb..10ed26b35 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/JsonReadCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/JsonReadCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,10 +20,10 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.JsonReadComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.JsonReadComputeNext; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @ExportLibrary(InteropLibrary.class) public class JsonReadCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/LongRangeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/LongRangeCollection.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/LongRangeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/LongRangeCollection.java index c92838607..99497a5c8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/LongRangeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/LongRangeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.LongRangeComputeNext; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.LongRangeComputeNext; @ExportLibrary(InteropLibrary.class) public class LongRangeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ReadLinesCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/ReadLinesCollection.java similarity index 79% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ReadLinesCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/ReadLinesCollection.java index cbd4b2b42..1660e7c5a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/ReadLinesCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/ReadLinesCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.ReadLinesComputeNext; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.ReadLinesComputeNext; import com.rawlabs.snapi.truffle.runtime.utils.TruffleCharInputStream; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/TimestampRangeCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/TimestampRangeCollection.java similarity index 74% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/TimestampRangeCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/TimestampRangeCollection.java index 90b79e9f7..09be48372 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/TimestampRangeCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/TimestampRangeCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,11 +19,11 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.TimestampRangeComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.IntervalObject; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.TimestampObject; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.TimestampRangeComputeNext; +import com.rawlabs.snapi.truffle.runtime.primitives.IntervalObject; +import com.rawlabs.snapi.truffle.runtime.primitives.TimestampObject; @ExportLibrary(InteropLibrary.class) public class TimestampRangeCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/UnionCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/UnionCollection.java similarity index 77% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/UnionCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/UnionCollection.java index 33d3ddd6e..0f343b0cf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/UnionCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/UnionCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.UnionComputeNext; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.UnionComputeNext; @ExportLibrary(InteropLibrary.class) public class UnionCollection implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlParseCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/XmlParseCollection.java similarity index 71% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlParseCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/XmlParseCollection.java index 26e604b49..6c85efce2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlParseCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/XmlParseCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,19 +20,19 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.XmlParseComputeNext; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.XmlParseComputeNext; @ExportLibrary(InteropLibrary.class) public class XmlParseCollection implements TruffleObject { private final String text; private final RootCallTarget parseNextRootCallTarget; - private final RawTruffleXmlParserSettings settings; + private final TruffleXmlParserSettings settings; public XmlParseCollection( - String text, RootCallTarget parseNextRootCallTarget, RawTruffleXmlParserSettings settings) { + String text, RootCallTarget parseNextRootCallTarget, TruffleXmlParserSettings settings) { this.text = text; this.parseNextRootCallTarget = parseNextRootCallTarget; this.settings = settings; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlReadCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/XmlReadCollection.java similarity index 73% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlReadCollection.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/XmlReadCollection.java index 947869979..e1a47931c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/iterable/sources/XmlReadCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/sources/XmlReadCollection.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; +package com.rawlabs.snapi.truffle.runtime.iterable.sources; import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.dsl.Bind; @@ -20,24 +20,24 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser.RawTruffleXmlParserSettings; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.XmlReadComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParserSettings; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.XmlReadComputeNext; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @ExportLibrary(InteropLibrary.class) public class XmlReadCollection implements TruffleObject { private final LocationObject locationObject; private final RootCallTarget parseNextRootCallTarget; - private RawTruffleXmlParserSettings settings; + private TruffleXmlParserSettings settings; private final String encoding; public XmlReadCollection( LocationObject locationObject, String encoding, RootCallTarget parseNextRootCallTarget, - RawTruffleXmlParserSettings settings) { + TruffleXmlParserSettings settings) { this.locationObject = locationObject; this.parseNextRootCallTarget = parseNextRootCallTarget; this.settings = settings; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/kryo/KryoNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java similarity index 95% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/kryo/KryoNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java index e5bf4c43d..646465c3d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/kryo/KryoNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java @@ -10,27 +10,26 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.kryo; +package com.rawlabs.snapi.truffle.runtime.kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.*; -import com.oracle.truffle.api.interop.*; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.ast.TypeGuards; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ListNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.list.ObjectList; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodesFactory; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.TypeGuards; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.list.ListNodes; +import com.rawlabs.snapi.truffle.runtime.list.ObjectList; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -147,8 +146,8 @@ public static boolean hasDuplicateKeys(Rql2RecordType t) { return list.size() != list.stream().distinct().count(); } - public static RawLanguage getRawLanguage(Node node) { - return RawLanguage.get(node); + public static Rql2Language getRql2Language(Node node) { + return Rql2Language.get(node); } @Specialization(guards = {"isRecordKind(t)"}) @@ -159,7 +158,7 @@ static Object doRecord( Rql2RecordType t, @Bind("$node") Node thisNode, @Cached(value = "hasDuplicateKeys(t)", allowUncached = true) boolean hasDuplicateKeys, - @Cached(value = "getRawLanguage(thisNode)", allowUncached = true) RawLanguage language, + @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, @Cached(value = "createAddProps(t.atts().size())", allowUncached = true) RecordNodes.AddPropNode[] addPropNode, @Cached(value = "addPropNode.length", allowUncached = true) int size, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/BooleanList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/BooleanList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/BooleanList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/BooleanList.java index 04494248e..ee15a5b75 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/BooleanList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/BooleanList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class BooleanList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ByteList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ByteList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ByteList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ByteList.java index 01ca305d1..65b43f237 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ByteList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ByteList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/DoubleList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/DoubleList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/DoubleList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/DoubleList.java index 75fb77ee0..4864db633 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/DoubleList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/DoubleList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/FloatList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/FloatList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/FloatList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/FloatList.java index 9f50b7605..e4b2e14de 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/FloatList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/FloatList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/IntList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/IntList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/IntList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/IntList.java index cbba98e19..b028642aa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/IntList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/IntList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ListNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ListNodes.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ListNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ListNodes.java index 8437ada6b..41df3acd2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ListNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ListNodes.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.dsl.Cached; import com.oracle.truffle.api.dsl.GenerateInline; @@ -18,8 +18,8 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; -import com.rawlabs.snapi.truffle.runtime.runtime.operators.OperatorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes; import java.util.ArrayList; import java.util.Arrays; @@ -78,7 +78,7 @@ static boolean isElementReadable(Node node, StringList list, int index) { } @Specialization - static boolean isElementReadable(Node node, RawArrayList list, int index) { + static boolean isElementReadable(Node node, TruffleArrayList list, int index) { return list.isElementReadable(index); } } @@ -136,7 +136,7 @@ static String get(Node node, StringList list, long index) { } @Specialization - static Object get(Node node, RawArrayList list, long index) { + static Object get(Node node, TruffleArrayList list, long index) { return list.get(index); } } @@ -194,7 +194,7 @@ static long size(Node node, StringList list) { } @Specialization - static long size(Node node, RawArrayList list) { + static long size(Node node, TruffleArrayList list) { return list.size(); } } @@ -252,7 +252,7 @@ static ListIterable toIterable(Node node, StringList list) { } @Specialization - static ListIterable toIterable(Node node, RawArrayList list) { + static ListIterable toIterable(Node node, TruffleArrayList list) { return list.toIterable(); } } @@ -316,14 +316,14 @@ static StringList sort(Node node, StringList list) { } @Specialization - static RawArrayList sort( + static TruffleArrayList sort( Node node, - RawArrayList list, + TruffleArrayList list, @Cached(inline = false) @Cached.Shared("compareUninlined") OperatorNodes.CompareUninlinedNode compare) { ArrayList aList = new ArrayList<>(list.getInnerList()); aList.sort(compare::execute); - return new RawArrayList(aList); + return new TruffleArrayList(aList); } } @@ -380,7 +380,7 @@ static StringList take(Node node, StringList list, int num) { } @Specialization - static RawArrayList take(Node node, RawArrayList list, int num) { + static TruffleArrayList take(Node node, TruffleArrayList list, int num) { return list.take(num); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/LongList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/LongList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/LongList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/LongList.java index 526dafd00..9bf015abb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/LongList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/LongList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ObjectList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ObjectList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ObjectList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ObjectList.java index 9bda8066d..7b5cb55f9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ObjectList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ObjectList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; @ExportLibrary(InteropLibrary.class) public final class ObjectList implements TruffleObject { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ShortList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ShortList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ShortList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ShortList.java index fce5ab392..ea97741fc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/ShortList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/ShortList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/StringList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/StringList.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/StringList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/StringList.java index 6d17958d2..0fb673634 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/StringList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/StringList.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.Arrays; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/RawArrayList.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/TruffleArrayList.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/RawArrayList.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/TruffleArrayList.java index 056535084..2f0e35d9e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/list/RawArrayList.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/list/TruffleArrayList.java @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.list; +package com.rawlabs.snapi.truffle.runtime.list; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.list.ListIterable; +import com.rawlabs.snapi.truffle.runtime.iterable.list.ListIterable; import java.util.ArrayList; @ExportLibrary(InteropLibrary.class) -public class RawArrayList implements TruffleObject { +public class TruffleArrayList implements TruffleObject { private final ArrayList list; - public RawArrayList(ArrayList list) { + public TruffleArrayList(ArrayList list) { this.list = list; } @@ -54,13 +54,13 @@ public ListIterable toIterable() { } @CompilerDirectives.TruffleBoundary - public RawArrayList take(int num) { + public TruffleArrayList take(int num) { if (num >= this.list.size()) { return this; } else if (num <= 0) { - return new RawArrayList(new ArrayList<>()); + return new TruffleArrayList(new ArrayList<>()); } else { - return new RawArrayList(new ArrayList<>(list.subList(0, num))); + return new TruffleArrayList(new ArrayList<>(list.subList(0, num))); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/operators/OperatorNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/operators/OperatorNodes.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/operators/OperatorNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/operators/OperatorNodes.java index 369e863bd..d8d5c0a5d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/operators/OperatorNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/operators/OperatorNodes.java @@ -10,23 +10,23 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.operators; +package com.rawlabs.snapi.truffle.runtime.operators; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.GeneratorNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.iterable.IterableNodes; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.*; -import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord; -import com.rawlabs.snapi.truffle.runtime.runtime.record.RecordNodes; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Nullable; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.Tryable; -import com.rawlabs.snapi.truffle.runtime.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Nullable; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.Tryable; +import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; +import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; +import com.rawlabs.snapi.truffle.runtime.primitives.*; +import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; +import com.rawlabs.snapi.truffle.runtime.record.PureRecord; +import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; @@ -401,9 +401,9 @@ static Object doTryable( @Bind("$node") Node thisNode, @Cached TryableNullableNodes.GetErrorNode getErrorNode) { if (Tryable.isError(left)) { - throw new RawTruffleRuntimeException(getErrorNode.execute(thisNode, left)); + throw new TruffleRuntimeException(getErrorNode.execute(thisNode, left)); } else { - throw new RawTruffleRuntimeException(getErrorNode.execute(thisNode, right)); + throw new TruffleRuntimeException(getErrorNode.execute(thisNode, right)); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/or/OrObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/or/OrObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java index 1f75f43d9..b48462fd5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/or/OrObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java @@ -10,16 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.or; +package com.rawlabs.snapi.truffle.runtime.or; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.interop.*; import com.oracle.truffle.api.library.CachedLibrary; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import java.time.*; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) public final class OrObject implements TruffleObject { @@ -46,7 +45,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return RawLanguage.class; + return Rql2Language.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/BinaryObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/BinaryObject.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/BinaryObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/BinaryObject.java index 1c78c9b4a..18739652c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/BinaryObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/BinaryObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.InvalidBufferOffsetException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DateObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java similarity index 85% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DateObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java index b335cdc3d..cfb591fd3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DateObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; -import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.DATE_FORMATTER; +import static com.rawlabs.snapi.truffle.runtime.primitives.TruffleTemporalFormatter.DATE_FORMATTER; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; @@ -20,7 +20,7 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.Rql2Language; import java.time.LocalDate; @ExportLibrary(InteropLibrary.class) @@ -57,7 +57,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return RawLanguage.class; + return Rql2Language.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DecimalObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DecimalObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java index f699cf7b3..f23dbf195 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/DecimalObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLanguage; @@ -18,7 +18,7 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.Rql2Language; import java.math.BigDecimal; @ExportLibrary(InteropLibrary.class) @@ -40,7 +40,7 @@ final boolean hasLanguage() { @ExportMessage final Class> getLanguage() { - return RawLanguage.class; + return Rql2Language.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/ErrorObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/ErrorObject.java similarity index 82% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/ErrorObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/ErrorObject.java index ed09ca83d..aa34a0013 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/ErrorObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/ErrorObject.java @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; @ExportLibrary(InteropLibrary.class) public class ErrorObject implements TruffleObject { @@ -37,6 +37,6 @@ public boolean isException() { @ExportMessage public RuntimeException throwException() { - return new RawTruffleRuntimeException(message); + return new TruffleRuntimeException(message); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/IntervalObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/IntervalObject.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/IntervalObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/IntervalObject.java index ec8291879..26a76fbcf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/IntervalObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/IntervalObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.dsl.Bind; import com.oracle.truffle.api.dsl.Cached; @@ -19,7 +19,7 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package.IntervalNodes; +import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; import java.time.Duration; @ExportLibrary(InteropLibrary.class) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationKVSettingHash.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationKVSettingHash.java similarity index 83% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationKVSettingHash.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationKVSettingHash.java index 2ecb6b53a..b047a57c8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationKVSettingHash.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationKVSettingHash.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; @@ -18,9 +18,9 @@ import com.oracle.truffle.api.library.ExportMessage; import java.util.Objects; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.AbstractGenerator; -import com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; -import com.rawlabs.snapi.truffle.runtime.runtime.list.StringList; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; +import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.sources.ExpressionComputeNext; +import com.rawlabs.snapi.truffle.runtime.list.StringList; /* This class is used to export Location KVSettings (as a Hash) */ diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java index f36a73ab0..26d512fcb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/LocationObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.interop.InteropLibrary; @@ -19,9 +19,9 @@ import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription; -import com.rawlabs.snapi.frontend.rql2.api.LocationDescription$; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription; +import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.utils.sources.api.Location; import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation; import com.rawlabs.utils.sources.bytestream.http.HttpByteStreamLocation; @@ -63,7 +63,7 @@ public ByteStreamLocation getByteStreamLocation() { if (location instanceof ByteStreamLocation) { return (ByteStreamLocation) location; } else { - throw new RawTruffleRuntimeException("not a byte stream location"); + throw new TruffleRuntimeException("not a byte stream location"); } } @@ -71,7 +71,7 @@ public FileSystemLocation getFileSystemLocation() { if (location instanceof FileSystemLocation) { return (FileSystemLocation) location; } else { - throw new RawTruffleRuntimeException("not a file system location"); + throw new TruffleRuntimeException("not a file system location"); } } @@ -79,7 +79,7 @@ public JdbcServerLocation getJdbcServerLocation() { if (location instanceof JdbcServerLocation) { return (JdbcServerLocation) location; } else { - throw new RawTruffleRuntimeException("not a database location"); + throw new TruffleRuntimeException("not a database location"); } } @@ -87,7 +87,7 @@ public HttpByteStreamLocation getHttpByteStreamLocation() { if (location instanceof HttpByteStreamLocation) { return (HttpByteStreamLocation) location; } else { - throw new RawTruffleRuntimeException("not an HTTP location"); + throw new TruffleRuntimeException("not an HTTP location"); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/NullObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/NullObject.java similarity index 94% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/NullObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/NullObject.java index 9fcf0f86b..c1a4b967f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/NullObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/NullObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimeObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TimeObject.java similarity index 86% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimeObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TimeObject.java index 226a8d5f5..0de510861 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimeObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TimeObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; -import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.TIME_FORMATTER; +import static com.rawlabs.snapi.truffle.runtime.primitives.TruffleTemporalFormatter.TIME_FORMATTER; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimestampObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TimestampObject.java similarity index 89% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimestampObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TimestampObject.java index bcddf5b99..3e0d1731d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TimestampObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TimestampObject.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; -import static com.rawlabs.snapi.truffle.runtime.runtime.primitives.TruffleTemporalFormatter.TIMESTAMP_FORMATTER; +import static com.rawlabs.snapi.truffle.runtime.primitives.TruffleTemporalFormatter.TIMESTAMP_FORMATTER; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.TruffleObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TruffleTemporalFormatter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TruffleTemporalFormatter.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TruffleTemporalFormatter.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TruffleTemporalFormatter.java index 50246c206..4b3d778a5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/primitives/TruffleTemporalFormatter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/TruffleTemporalFormatter.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.primitives; +package com.rawlabs.snapi.truffle.runtime.primitives; import java.time.format.DateTimeFormatter; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecord.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecord.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java index 0925717b9..1525326e8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecord.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.record; +package com.rawlabs.snapi.truffle.runtime.record; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.TruffleLanguage; @@ -25,7 +25,7 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; import com.rawlabs.compiler.utils.RecordFieldsNaming; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.Rql2Language; import java.util.Arrays; import java.util.Vector; @@ -95,7 +95,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return RawLanguage.class; + return Rql2Language.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecordNodes.java similarity index 93% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecordNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecordNodes.java index c14ac3f55..8b0ece746 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/DuplicateKeyRecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecordNodes.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.record; +package com.rawlabs.snapi.truffle.runtime.record; -import static com.rawlabs.snapi.truffle.runtime.PropertyType.*; +import static com.rawlabs.snapi.truffle.ast.PropertyType.*; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.library.CachedLibrary; @@ -20,8 +20,8 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.object.DynamicObjectLibrary; -import com.rawlabs.snapi.truffle.runtime.PropertyType; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.ast.PropertyType; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; // (az) Whenever using any of these nodes, create one per property public class DuplicateKeyRecordNodes { @@ -186,7 +186,7 @@ static byte getByte( int idx = duplicateKeyRecord.getKeyIndex(key); return (byte) valuesLibrary.getIntOrDefault(duplicateKeyRecord, idx, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -202,7 +202,7 @@ static short getShort( int idx = duplicateKeyRecord.getKeyIndex(key); return (short) valuesLibrary.getIntOrDefault(duplicateKeyRecord, idx, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -218,7 +218,7 @@ static int getInt( int idx = duplicateKeyRecord.getKeyIndex(key); return valuesLibrary.getIntOrDefault(duplicateKeyRecord, idx, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -234,7 +234,7 @@ static long getLong( int idx = duplicateKeyRecord.getKeyIndex(key); return valuesLibrary.getLongOrDefault(duplicateKeyRecord, idx, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -250,7 +250,7 @@ static double getDouble( int idx = duplicateKeyRecord.getKeyIndex(key); return valuesLibrary.getDoubleOrDefault(duplicateKeyRecord, idx, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -281,7 +281,7 @@ static Object exec( @CachedLibrary("record") DynamicObjectLibrary valuesLibrary) { Object[] keys = valuesLibrary.getKeyArray(record); if (index < 0 || index >= keys.length) { - throw new RawTruffleInternalErrorException("Index out of bounds in record"); + throw new TruffleInternalErrorException("Index out of bounds in record"); } return valuesLibrary.getOrDefault(record, index, null); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/KeysObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/KeysObject.java similarity index 95% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/KeysObject.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/KeysObject.java index 80c28625a..702dca07c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/KeysObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/KeysObject.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.record; +package com.rawlabs.snapi.truffle.runtime.record; import com.oracle.truffle.api.interop.InteropLibrary; import com.oracle.truffle.api.interop.InvalidArrayIndexException; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecord.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java similarity index 96% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecord.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java index 45d19fc0b..e97282802 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecord.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.record; +package com.rawlabs.snapi.truffle.runtime.record; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.dsl.Bind; @@ -22,7 +22,7 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; +import com.rawlabs.snapi.truffle.Rql2Language; @ExportLibrary(InteropLibrary.class) public class PureRecord extends DynamicObject implements TruffleObject { @@ -37,7 +37,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return RawLanguage.class; + return Rql2Language.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecordNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java index 72bb75025..86fd91804 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/PureRecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.record; +package com.rawlabs.snapi.truffle.runtime.record; -import static com.rawlabs.snapi.truffle.runtime.PropertyType.*; +import static com.rawlabs.snapi.truffle.ast.PropertyType.*; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.library.CachedLibrary; @@ -20,9 +20,9 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.object.DynamicObjectLibrary; -import com.rawlabs.snapi.truffle.runtime.PropertyType; -import com.rawlabs.snapi.truffle.runtime.RawLanguage; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleInternalErrorException; +import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.ast.PropertyType; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; // (az) Whenever using any of these nodes, create one per property public class PureRecordNodes { @@ -139,7 +139,7 @@ static Object exec( @Cached AddPropNode addPropNode, @Cached GetKeysNode getKeysNode, @Cached GetValueNode getValueNode) { - RawLanguage lang = RawLanguage.get(thisNode); + Rql2Language lang = Rql2Language.get(thisNode); PureRecord newRecord = lang.createPureRecord(); Object[] keys = getKeysNode.execute(thisNode, pureRecord); for (Object k : keys) { @@ -203,7 +203,7 @@ static Object exec( @CachedLibrary("pureRecord") DynamicObjectLibrary valuesLibrary) { Object[] keys = valuesLibrary.getKeyArray(pureRecord); if (index < 0 || index >= keys.length) { - throw new RawTruffleInternalErrorException("Index out of bounds in record"); + throw new TruffleInternalErrorException("Index out of bounds in record"); } return valuesLibrary.getOrDefault(pureRecord, keys[index], null); } @@ -228,7 +228,7 @@ static byte getByte( try { return (byte) valuesLibrary.getIntOrDefault(pureRecord, key, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -243,7 +243,7 @@ static short getShort( try { return (short) valuesLibrary.getIntOrDefault(pureRecord, key, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -258,7 +258,7 @@ static int getInt( try { return valuesLibrary.getIntOrDefault(pureRecord, key, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -273,7 +273,7 @@ static long getLong( try { return valuesLibrary.getLongOrDefault(pureRecord, key, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } @@ -288,7 +288,7 @@ static double getDouble( try { return valuesLibrary.getDoubleOrDefault(pureRecord, key, -1); } catch (UnexpectedResultException e) { - throw new RawTruffleInternalErrorException("Unexpected result", e); + throw new TruffleInternalErrorException("Unexpected result", e); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/RecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/RecordNodes.java similarity index 97% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/RecordNodes.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/RecordNodes.java index dc7e913a7..60560658f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/record/RecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/RecordNodes.java @@ -10,9 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.truffle.runtime.runtime.record; - -import static com.rawlabs.snapi.truffle.runtime.PropertyType.*; +package com.rawlabs.snapi.truffle.runtime.record; import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java deleted file mode 100644 index 76241972a..000000000 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/exceptions/rdbms/JdbcExceptionHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; - -import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.runtime.ast.io.jdbc.JdbcQuery; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import java.sql.SQLException; - -public class JdbcExceptionHandler { - - public RawTruffleRuntimeException rewrite(SQLException e, JdbcQuery rs, Node location) { - return new JdbcReaderRawTruffleException(e.getMessage(), rs, e, location); - } - - public RawTruffleRuntimeException columnParseError( - SQLException e, String colName, Node location) { - return new JdbcParserRawTruffleException( - String.format("column '%s': %s", colName, e.getMessage()), e, location); - } - - public RawTruffleRuntimeException rewrite(SQLException e, JdbcQuery rs) { - return new JdbcReaderRawTruffleException(e.getMessage(), rs, e, null); - } -} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java deleted file mode 100644 index 24f1b27ab..000000000 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/runtime/generator/collection/abstract_generator/compute_next/sources/CsvReadFromStringComputeNext.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator.compute_next.sources; - -import com.oracle.truffle.api.RootCallTarget; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParser; -import com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser.RawTruffleCsvParserSettings; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleCharStream; -import com.rawlabs.snapi.truffle.runtime.utils.RawTruffleStringCharStream; - -public class CsvReadFromStringComputeNext { - private final RawTruffleCharStream stream; - private final RootCallTarget rowParserCallTarget; - private final RawTruffleCsvParserSettings settings; - private RawTruffleCsvParser parser; - - public CsvReadFromStringComputeNext( - String str, RootCallTarget rowParserCallTarget, RawTruffleCsvParserSettings settings) { - this.rowParserCallTarget = rowParserCallTarget; - this.settings = settings; - this.stream = new RawTruffleStringCharStream(str); - } - - public void setParser(RawTruffleCsvParser parser) { - this.parser = parser; - } - - public RawTruffleCharStream getStream() { - return stream; - } - - public RootCallTarget getRowParserCallTarget() { - return rowParserCallTarget; - } - - public RawTruffleCsvParserSettings getSettings() { - return settings; - } - - public RawTruffleCsvParser getParser() { - return parser; - } -} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java index 0016c813a..8cf214765 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/IOUtils.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.utils.core.RawSettings; import java.io.IOException; import java.nio.file.Files; @@ -29,7 +29,7 @@ public static Path getScratchPath(RawSettings rawSettings) { try { Files.createDirectories(p); } catch (IOException ex) { - throw new RawTruffleRuntimeException("failed to create scratch file", ex); + throw new TruffleRuntimeException("failed to create scratch file", ex); } } return p; @@ -40,7 +40,7 @@ public static Path getScratchFile(String prefix, String suffix, RawSettings rawS try { return Files.createTempFile(getScratchPath(rawSettings), prefix, suffix); } catch (IOException ex) { - throw new RawTruffleRuntimeException("failed to create scratch file", ex); + throw new TruffleRuntimeException("failed to create scratch file", ex); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java index 9884f0a87..36f91fbf5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java @@ -14,7 +14,7 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import scala.collection.immutable.Vector; public class KryoFootPrint { @@ -61,7 +61,7 @@ public static int of(Rql2TypeWithProperties type) { for (int i = 0; i < n; i++) size += of((Rql2TypeWithProperties) atts.apply(i).tipe()); return size; } else { - throw new RawTruffleRuntimeException("Unknown type: " + type); + throw new TruffleRuntimeException("Unknown type: " + type); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java index 4fc3da1a7..a619917fd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharInputStream.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import java.io.Reader; -public class TruffleCharInputStream extends RawTruffleCharStream { +public class TruffleCharInputStream extends TruffleCharStream { TruffleInputStream stream; String encoding; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleCharStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharStream.java similarity index 92% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleCharStream.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharStream.java index 6be9b34fb..a3b3dfdd7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleCharStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleCharStream.java @@ -14,7 +14,7 @@ import java.io.Reader; -public abstract class RawTruffleCharStream { +public abstract class TruffleCharStream { public abstract Reader getReader(); public abstract String positionDescription(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java index 6c9c9b139..4404342b7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleInputStream.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.RawTruffleRuntimeException; -import com.rawlabs.snapi.truffle.runtime.runtime.primitives.LocationObject; +import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; +import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawException; import com.rawlabs.utils.sources.api.Encoding; import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation; @@ -39,7 +39,7 @@ public ByteStreamLocation getLocation() { try { return locationObject.getByteStreamLocation(); } catch (RawException ex) { - throw new RawTruffleRuntimeException(ex.getMessage(), ex, null); + throw new TruffleRuntimeException(ex.getMessage(), ex, null); } } @@ -58,7 +58,7 @@ public InputStream getInputStream() { try { return getLocation().getInputStream(); } catch (RawException ex) { - throw new RawTruffleRuntimeException(ex.getMessage(), ex, null); + throw new TruffleRuntimeException(ex.getMessage(), ex, null); } } @@ -67,7 +67,7 @@ public Reader getReader(String encoding) { try { return getLocation().getReader(toEncoding(encoding)); } catch (RawException ex) { - throw new RawTruffleRuntimeException(ex.getMessage(), ex, null); + throw new TruffleRuntimeException(ex.getMessage(), ex, null); } } @@ -77,7 +77,7 @@ private static Encoding toEncoding(String s) { if (r.isRight()) { return r.right().get(); } else { - throw new RawTruffleRuntimeException(r.left().get()); + throw new TruffleRuntimeException(r.left().get()); } } @@ -86,7 +86,7 @@ public Reader getReader(Encoding encoding) { try { return getLocation().getReader(encoding); } catch (RawException ex) { - throw new RawTruffleRuntimeException(ex.getMessage(), ex, null); + throw new TruffleRuntimeException(ex.getMessage(), ex, null); } } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleStringCharStream.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleStringCharStream.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleStringCharStream.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleStringCharStream.java index c0e122db0..e126d83bd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/RawTruffleStringCharStream.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/TruffleStringCharStream.java @@ -15,11 +15,11 @@ import java.io.Reader; import java.io.StringReader; -public class RawTruffleStringCharStream extends RawTruffleCharStream { +public class TruffleStringCharStream extends TruffleCharStream { private final String string; - public RawTruffleStringCharStream(String content) { + public TruffleStringCharStream(String content) { this.string = content; } diff --git a/snapi-truffle/src/main/java/module-info.java b/snapi-truffle/src/main/java/module-info.java index 03fbd6f7f..401fcef38 100644 --- a/snapi-truffle/src/main/java/module-info.java +++ b/snapi-truffle/src/main/java/module-info.java @@ -10,8 +10,7 @@ * licenses/APL.txt. */ -import com.rawlabs.compiler.CompilerServiceBuilder; -import com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationFromStringEntry; +import com.rawlabs.snapi.truffle.Rql2LanguageProvider; module raw.snapi.truffle { // Direct dependencies @@ -27,6 +26,7 @@ requires scala.library; requires com.ctc.wstx; requires raw.utils.core; + requires raw.protocol.raw; requires raw.protocol.compiler; requires raw.compiler; requires raw.utils.sources; @@ -53,426 +53,6 @@ requires com.google.common; requires jul.to.slf4j; - uses com.rawlabs.snapi.frontend.rql2.api.EntryExtension; - uses com.rawlabs.snapi.frontend.rql2.api.PackageExtension; - uses CompilerServiceBuilder; - provides com.oracle.truffle.api.provider.TruffleLanguageProvider with - com.rawlabs.snapi.truffle.runtime.RawLanguageProvider; - provides com.rawlabs.snapi.frontend.rql2.api.EntryExtension with - com.rawlabs.snapi.truffle.emitter.builtin.aws_extension.TruffleAwsV4SignedRequestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.byte_extension.TruffleByteFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleEmptyCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleBuildCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFilterCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleOrderByCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension - .TruffleTransformCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleDistinctCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleCountCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTupleAvgCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMinCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMaxCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleSumCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFirstCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleLastCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleTakeCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnnestCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleFromCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleGroupCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension - .TruffleInternalJoinCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension - .TruffleInternalEquiJoinCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleUnionCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleExistsCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleZipCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.collection_extension.TruffleMkStringCollectionEntry, - com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvReadEntry, - com.rawlabs.snapi.truffle.emitter.builtin.csv_extension.TruffleCsvParseEntry, - com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.double_extension.TruffleDoubleFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.environment_extension - .TruffleEnvironmentParameterEntry, - com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorBuildWithTypeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.error_extension.TruffleErrorGetEntry, - com.rawlabs.snapi.truffle.emitter.builtin.float_extension.TruffleFloatFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.function_extension.TruffleFunctionInvokeAfterEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleBuildIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.int_extension.TruffleIntRangeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleReadJsonEntry, - com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TruffleParseJsonEntry, - com.rawlabs.snapi.truffle.emitter.builtin.json_extension.TrufflePrintJsonEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleEmptyListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleBuildListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGetListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFilterListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTransformListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleTakeListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleSumListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMaxListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleMinListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFirstListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleLastListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleCountListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleFromListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleUnsafeFromListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleGroupListEntry, - com.rawlabs.snapi.truffle.emitter.builtin.list_extension.TruffleExistsListEntry, - TruffleLocationFromStringEntry, - com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationDescribeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationLlEntry, - com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.long_extension.TruffleLongRangeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAbsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension.TruffleMySQLQueryEntry, - com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableEmptyEntry, - com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableIsNullEntry, - com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableUnsafeGetEntry, - com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension.TruffleNullableTransformEntry, - com.rawlabs.snapi.truffle.emitter.builtin.nullable_tryable_extension - .TruffleFlatMapNullableTryableEntry, - com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension.TruffleOracleQueryEntry, - com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension.TrufflePostgreSQLQueryEntry, - com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordConcatEntry, - com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordFieldsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordAddFieldEntry, - com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordRemoveFieldEntry, - com.rawlabs.snapi.truffle.emitter.builtin.record_extension.TruffleRecordGetFieldByIndexEntry, - com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension.TruffleSnowflakeQueryEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromEpochDayEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateFromTimestampEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateParseEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateNowEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateYearEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateMonthEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateDayEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateAddIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.date_extension.TruffleDateSubtractIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension.TruffleDecimalRoundEntry, - com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentSecretEntry, - com.rawlabs.snapi.truffle.emitter.builtin.environment_extension.TruffleEnvironmentScopesEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalToMillisEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalFromMillisEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalParseEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalYearsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMonthsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalWeeksEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalDaysEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalHoursEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMinutesEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalSecondsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.interval_extension.TruffleIntervalMillisEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPiEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRandomEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathPowerEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtn2Entry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAcosEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAsinEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathAtanEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCeilingEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCosEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathCotEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathDegreesEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathExpEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLogEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathLog10Entry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathRadiansEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSignEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSinEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSqrtEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathTanEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathSquareEntry, - com.rawlabs.snapi.truffle.emitter.builtin.math_extension.TruffleMathFloorEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpReadEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpGetEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPostEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPutEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpDeleteEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpHeadEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpPatchEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpOptionsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlEncode, - com.rawlabs.snapi.truffle.emitter.builtin.http_extension.TruffleHttpUrlDecode, - com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleReadXmlEntry, - com.rawlabs.snapi.truffle.emitter.builtin.xml_extension.TruffleParseXmlEntry, - com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeCastEntry, - com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeEmptyEntry, - com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeMatchEntry, - com.rawlabs.snapi.truffle.emitter.builtin.type_extension.TruffleTypeProtectCastEntry, - com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryBase64Entry, - com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleBinaryReadEntry, - com.rawlabs.snapi.truffle.emitter.builtin.binary_extension.TruffleFromStringBinaryEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampFromDateEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampParseEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampNowEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampRangeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampYearEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMonthEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampDayEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampHourEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMinuteEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSecondEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampMillisEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension - .TruffleTimestampFromUnixTimestampEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension - .TruffleTimestampToUnixTimestampEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampTimeBucketEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension.TruffleTimestampSubtractEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension - .TruffleTimestampAddIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension - .TruffleTimestampSubtractIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeParseEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeNowEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeHourEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMinuteEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSecondEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeMillisEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeAddIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.time_extension.TruffleTimeSubtractIntervalEntry, - com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryFlatMapEntry, - com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryUnsafeGetEntry, - com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsErrorEntry, - com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryIsSuccessEntry, - com.rawlabs.snapi.truffle.emitter.builtin.try_extension.TruffleTryTransformEntry, - com.rawlabs.snapi.truffle.emitter.builtin.success_extension.TruffleSuccessBuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringContainsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringTrimEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLTrimEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringRTrimEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplaceEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReverseEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReplicateEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringUpperEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLowerEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSplitEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringLengthEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringSubStringEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCountSubStringEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringStartsWithEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEmptyEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleBase64EntryExtension, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringEncodeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringDecodeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension - .TruffleStringLevenshteinDistanceEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringReadLinesEntry, - com.rawlabs.snapi.truffle.emitter.builtin.string_extension.TruffleStringCapitalizeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension.TruffleSQLServerQueryEntry, - com.rawlabs.snapi.truffle.emitter.builtin.short_extension.TruffleShortFromEntry, - com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexReplaceEntry, - com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexMatchesEntry, - com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexFirstMatchInEntry, - com.rawlabs.snapi.truffle.emitter.builtin.regex_extension.TruffleRegexGroupsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.s3_extension.TruffleS3BuildEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleByteValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleBoolValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleDateValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleDoubleValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleFloatValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleIntervalValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleIntValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleListValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleLongValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleMandatoryExpArgsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleMandatoryValueArgsEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleOptionalExpArgsTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleOptionalValueArgsTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleRecordValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleShortValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension - .TruffleStrictArgsColPassThroughTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStrictArgsTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleStringValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleTimestampValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleTimeValueArgTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarExpArgsTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarNullableStringExpTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension - .TruffleVarNullableStringValueTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.test_extension.TruffleVarValueArgsTestEntry, - com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension.TruffleKryoDecodeEntry, - com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension.TruffleKryoEncodeEntry; - - exports com.rawlabs.snapi.truffle.runtime; - exports com.rawlabs.snapi.truffle.runtime.boundary; - exports com.rawlabs.snapi.truffle.runtime.runtime.record; - exports com.rawlabs.snapi.truffle.runtime.runtime.operators; - exports com.rawlabs.snapi.truffle.runtime.runtime.function; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.xml; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.json; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.csv; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.binary; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.rdbms; - exports com.rawlabs.snapi.truffle.runtime.runtime.data_structures.treemap; - exports com.rawlabs.snapi.truffle.runtime.runtime.primitives; - exports com.rawlabs.snapi.truffle.runtime.runtime.list; - exports com.rawlabs.snapi.truffle.runtime.runtime.or; - exports com.rawlabs.snapi.truffle.runtime.runtime.generator.list; - exports com.rawlabs.snapi.truffle.runtime.runtime.generator.collection; - exports com.rawlabs.snapi.truffle.runtime.runtime.generator.collection.abstract_generator; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .abstract_generator - .compute_next; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .abstract_generator - .compute_next - .sources; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .abstract_generator - .compute_next - .operations; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .off_heap_generator - .record_shaper; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .off_heap_generator - .input_buffer; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .off_heap_generator - .off_heap; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .off_heap_generator - .off_heap - .group_by; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .off_heap_generator - .off_heap - .order_by; - exports com.rawlabs - .snapi - .truffle - .runtime - .runtime - .generator - .collection - .off_heap_generator - .off_heap - .distinct; - exports com.rawlabs.snapi.truffle.runtime.runtime.iterable; - exports com.rawlabs.snapi.truffle.runtime.runtime.iterable.operations; - exports com.rawlabs.snapi.truffle.runtime.runtime.iterable.list; - exports com.rawlabs.snapi.truffle.runtime.runtime.iterable.sources; - exports com.rawlabs.snapi.truffle.runtime.runtime.kryo; - exports com.rawlabs.snapi.truffle.runtime.utils; - exports com.rawlabs.snapi.truffle.runtime.tryable_nullable; - exports com.rawlabs.snapi.truffle.runtime.ast; - exports com.rawlabs.snapi.truffle.runtime.ast.io.kryo; - exports com.rawlabs.snapi.truffle.runtime.ast.io.xml.parser; - exports com.rawlabs.snapi.truffle.runtime.ast.io.jdbc; - exports com.rawlabs.snapi.truffle.runtime.ast.io.json.reader; - exports com.rawlabs.snapi.truffle.runtime.ast.io.json.reader.parser; - exports com.rawlabs.snapi.truffle.runtime.ast.io.json.writer; - exports com.rawlabs.snapi.truffle.runtime.ast.io.json.writer.internal; - exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader; - exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.reader.parser; - exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer; - exports com.rawlabs.snapi.truffle.runtime.ast.io.csv.writer.internal; - exports com.rawlabs.snapi.truffle.runtime.ast.io.binary; - exports com.rawlabs.snapi.truffle.runtime.ast.local; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.unary; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.collection; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.iterable.list; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.record; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.option; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.function; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.tryable; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.binary; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.literals; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.regex_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.type_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.environment_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.math_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.aws_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.http_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.short_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.double_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.long_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.decimal_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.float_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.int_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.numeric.byte_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.function_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.date_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.time_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.interval_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.temporals.timestamp_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.string_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.location_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.builtin.binary_package; - exports com.rawlabs.snapi.truffle.runtime.ast.expressions.aggregation; - exports com.rawlabs.snapi.truffle.runtime.ast.controlflow; - exports com.rawlabs.snapi.truffle.runtime.ast.osr; - exports com.rawlabs.snapi.truffle.runtime.ast.osr.bodies; - exports com.rawlabs.snapi.truffle.runtime.ast.osr.conditions; - exports com.rawlabs.snapi.truffle.runtime.runtime.exceptions.validation; - exports com.rawlabs.snapi.truffle.emitter.compiler; - exports com.rawlabs.snapi.truffle.emitter.output; - exports com.rawlabs.snapi.truffle.emitter.builtin; - exports com.rawlabs.snapi.truffle.emitter; + Rql2LanguageProvider; } diff --git a/sql-compiler/src/main/java/module-info.java b/sql-compiler/src/main/java/module-info.java index 7973f91f3..c66d64a87 100644 --- a/sql-compiler/src/main/java/module-info.java +++ b/sql-compiler/src/main/java/module-info.java @@ -21,6 +21,7 @@ requires com.fasterxml.jackson.dataformat.csv; requires com.fasterxml.jackson.core; requires com.fasterxml.jackson.databind; + requires raw.protocol.raw; requires raw.protocol.compiler; requires raw.compiler; requires raw.sql.parser; diff --git a/sql-compiler/src/main/resources/reference.conf b/sql-compiler/src/main/resources/reference.conf index 4036b8502..de69023e1 100644 --- a/sql-compiler/src/main/resources/reference.conf +++ b/sql-compiler/src/main/resources/reference.conf @@ -3,16 +3,16 @@ raw.sql.compiler { missing-relation = "Did you forget to add credentials?" } metadata-cache { - size = 1000 // How many individual user metadata caches to keep - duration = 30m // How long to keep user metadata data cache - match-validity = 30s // How long matches are kept after a triggering keystroke - max-matches = 30 // How many matches to keep (per user) for potential reuse + size = 1000 # How many individual user metadata caches to keep + duration = 30m # How long to keep user metadata data cache + match-validity = 30s # How long matches are kept after a triggering keystroke + max-matches = 30 # How many matches to keep (per user) for potential reuse } pool { - max-connections = 50 // Total max connections to the FDW database - max-connections-per-db = 5 // Total max connection to a given database - idle-timeout = 20m // How long before a connection is considered to be idle (for GC or for checking health) - health-check-period = 5s // How often to check for health of connections - is-valid-seconds = 5 // Controls the JDBC isValid(seconds) setting to use. Apparently 5 is a common value. + max-connections = 50 # Total max connections to the FDW database + max-connections-per-db = 5 # Total max connection to a given database + idle-timeout = 20m # How long before a connection is considered to be idle (for GC or for checking health) + health-check-period = 5s # How often to check for health of connections + is-valid-seconds = 5 # Controls the JDBC isValid(seconds) setting to use. Apparently 5 is a common value. } } \ No newline at end of file diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala index 031a1842d..43787d930 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/NamedParametersPreparedStatement.scala @@ -48,11 +48,6 @@ import org.postgresql.util.PSQLException import java.sql.{Connection, ResultSet, ResultSetMetaData} import scala.collection.mutable -/* This class is wrapping the PreparedStatement class from the JDBC API. - * It parses the SQL code and extract the named parameters, infer their types from how they're used. - * It also provides methods to set the parameters by name and execute the query. - */ - class NamedParametersPreparedStatementException(val errors: List[ErrorMessage]) extends Exception // A postgres type, described by its JDBC enum type + the regular postgres type name. @@ -69,8 +64,17 @@ private case class ParamLocation( jdbcIndex: Int // index in the source code to use in JDBC `set` APIs ) -/* The parameter `parsedTree` implies parsing errors have been potential caught and reported - upfront, but we can't assume that tree is error-free. Indeed, for +/** + * This class is wrapping the PreparedStatement class from the JDBC API. + * It parses the SQL code and extract the named parameters, infer their types from how they're used. + * It also provides methods to set the parameters by name and execute the query. + * + * The parameter `parsedTree` implies parsing errors have been potential caught and reported upfront, + * but we can't assume that tree is error-free. Indeed, for + * + * @param conn the JDBC connection + * @param parsedTree the parsed SQL code + * @param scopes the query scopes */ class NamedParametersPreparedStatement( conn: Connection, @@ -108,7 +112,7 @@ class NamedParametersPreparedStatement( private val treePositions = parsedTree.positions - // If this crashes on None.get, that's a bug + // If this crashes on None.get, that's a bug. private def getStart(node: SqlBaseNode): Position = treePositions.getStart(node).get private def getStartOffset(node: SqlBaseNode): Int = getStart(node).optOffset.get @@ -158,8 +162,8 @@ class NamedParametersPreparedStatement( // Now we'll populate this parameter Map with info, or errors. private val declaredTypeInfo = mutable.Map.empty[String, Either[List[ErrorMessage], QueryParamInfo]] - /* This Map contains only entries that have a '@type'. If the type can be parsed, the value is - * a Right(PostgresType), else a Left(ErrorMessage) */ + // This Map contains only entries that have a '@type'. If the type can be parsed, the value is + // a Right(PostgresType), else a Left(ErrorMessage). private val userSpecifiedTypes = for ((name, info) <- parsedTree.params; tipe <- info.tipe) yield name -> { SqlTypesUtils @@ -178,9 +182,9 @@ class NamedParametersPreparedStatement( private case class DefaultValue(value: RawValue, tipe: PostgresType) - /* This is a Map containing only entries that have a '@default'. If there's a Right entry in `userSpecifiedTypes` (a - * proper `@type` was specified), we use it: force a cast, otherwise not. If the expression runs fine, we get - * a Right(DefaultValue) that potentially confirms the expression matches with the `@type`, else a Left(ErrorMessage) */ + // This is a Map containing only entries that have a '@default'. If there's a Right entry in `userSpecifiedTypes` + // (a proper `@type` was specified), we use it: force a cast, otherwise not. If the expression runs fine, we get + // a Right(DefaultValue) that potentially confirms the expression matches with the `@type`, else a Left(ErrorMessage). private val userSpecifiedDefaultValues = { val quickStatement = conn.createStatement() for ((paramName, info) <- parsedTree.params; sqlCode <- info.default) yield paramName -> { @@ -238,13 +242,12 @@ class NamedParametersPreparedStatement( declaredTypeInfo.put(p, newState) } - /* We have the single query code in `code` (with named parameters). Internally we need to replace - * the named parameters with question marks, and keep track of the mapping between the - * parameter names and the question marks. - * - * However we want to remap offset of errors returned by Postgres, to an offset in the user code. - * For that, we can use `fromPgsqlOffset`. - */ + // We have the single query code in `code` (with named parameters). Internally we need to replace + // the named parameters with question marks, and keep track of the mapping between the + // parameter names and the question marks. + // + // However we want to remap offset of errors returned by Postgres, to an offset in the user code. + // For that, we can use `fromPgsqlOffset`. // a table of offset -> shift, meant to remap a postgres error offset to the original user's code. Used // by fromPgsqlOffset, computed when generating the JDBC plain code. @@ -294,7 +297,7 @@ class NamedParametersPreparedStatement( case None => "?" } jdbc.append(argToken) // that's the '?' replacing the argument - /* we saw ? is eventually sent to postgres as $X. The arg size is different */ + // we saw ? is eventually sent to postgres as $X. The arg size is different val pgArgSize = argToken.length + 1 pgCodeSize += pgArgSize // shift that would permit to compute the user offset from the postgres offset @@ -321,9 +324,9 @@ class NamedParametersPreparedStatement( } } + // When we're collecting metadata info, an SQLException can highlight a problem with the statement + // (syntax error, semantic error). private val paramMetadata = - /* When we're collecting metadata info, an SQLException can highlight a problem with the statement - * (syntax error, semantic error) */ try { stmt.getParameterMetaData // throws SQLException in case of problem } catch { diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala index 4879557f7..15e2e46cf 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCodeUtils.scala @@ -24,7 +24,7 @@ import com.rawlabs.sql.compiler.antlr4.{ import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{oncetd, query} import org.bitbucket.inkytonik.kiama.util.Position -case class SqlIdentifier(value: String, quoted: Boolean) +final case class SqlIdentifier(value: String, quoted: Boolean) class SqlCodeUtils(parsedTree: ParseProgramResult) { diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala index 046dc7e21..a31de3de4 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlCompilerService.scala @@ -14,7 +14,7 @@ package com.rawlabs.sql.compiler import com.google.common.cache.{CacheBuilder, CacheLoader} import com.rawlabs.compiler._ -import com.rawlabs.sql.compiler.antlr4.{ParseProgramResult, RawSqlSyntaxAnalyzer, SqlIdnNode, SqlParamUseNode} +import com.rawlabs.sql.compiler.antlr4.{ParseProgramResult, SqlIdnNode, SqlParamUseNode, SqlSyntaxAnalyzer} import com.rawlabs.sql.compiler.metadata.UserMetadataCache import com.rawlabs.sql.compiler.writers.{TypedResultSetCsvWriter, TypedResultSetJsonWriter} import com.rawlabs.utils.core.{RawSettings, RawUtils} @@ -54,18 +54,20 @@ class SqlCompilerService()(implicit protected val settings: RawSettings) extends override def language: Set[String] = Set("sql") + // Parse and check the program for syntax errors. private def safeParse(prog: String): Either[List[ErrorMessage], ParseProgramResult] = { val positions = new Positions - val syntaxAnalyzer = new RawSqlSyntaxAnalyzer(positions) + val syntaxAnalyzer = new SqlSyntaxAnalyzer(positions) val tree = syntaxAnalyzer.parse(prog) val errors = tree.errors.collect { case e: ErrorMessage => e } if (errors.nonEmpty) Left(errors) else Right(tree) } + // Parse the program and return the parse tree without checking for syntax errors. private def parse(prog: String): ParseProgramResult = { val positions = new Positions - val syntaxAnalyzer = new RawSqlSyntaxAnalyzer(positions) + val syntaxAnalyzer = new SqlSyntaxAnalyzer(positions) syntaxAnalyzer.parse(prog) } @@ -359,6 +361,7 @@ class SqlCompilerService()(implicit protected val settings: RawSettings) extends logger.warn("SqlConnectionPool connection failure", ex) HoverResponse(None) } + case other => throw new AssertionError(s"Unexpected node type: $other") } .getOrElse(HoverResponse(None)) } catch { diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala index 7840d46fa..7d5fd643f 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlIntervals.scala @@ -18,17 +18,18 @@ import scala.util.matching.Regex object SqlIntervals { - val postgresIntervalRegex: Regex = + private val POSTGRES_INTERVAL_REGEX: Regex = """(?:(\d+)\s+years?)?(?:\s*(\d+) mons?)?(?:\s*(\d+) days?)?(?:\s*(\d+):(\d+):(\d+)(?:\.(\d+))?)?""".r - def padRight(s: String, n: Int): String = { - val padding = n - s.length - if (padding <= 0) s - else s + "0" * padding - } - def parseInterval(in: String): RawInterval = { + /** + * Converts a string representation of an interval to a RawInterval + * + * @param in the string representation of the interval + * @return the RawInterval + */ + def stringToInterval(in: String): RawInterval = { in match { - case postgresIntervalRegex(years, months, days, hours, minutes, seconds, fraction) => + case POSTGRES_INTERVAL_REGEX(years, months, days, hours, minutes, seconds, fraction) => val yearsInt = Option(years).map(_.toInt).getOrElse(0) val monthsInt = Option(months).map(_.toInt).getOrElse(0) val daysInt = Option(days).map(_.toInt).getOrElse(0) @@ -40,12 +41,17 @@ object SqlIntervals { val fractionInt = Option(fraction).map(x => padRight(x, 3).take(3).toInt).getOrElse(0) val weeks = 0 RawInterval(yearsInt, monthsInt, weeks, daysInt, hoursInt, minutesInt, secondsInt, fractionInt) - case _ => throw new IllegalArgumentException(s"Invalid interval format: $in") + case _ => throw new AssertionError(s"Invalid interval format: $in") } } + /** + * Converts a RawInterval to a string representation + * + * @param in the RawInterval + * @return the string representation of the interval + */ def intervalToString(in: RawInterval): String = { - val time = new StringBuilder() val result = new StringBuilder("P") @@ -73,4 +79,11 @@ object SqlIntervals { result.toString() } + + private def padRight(s: String, n: Int): String = { + val padding = n - s.length + if (padding <= 0) s + else s + "0" * padding + } + } diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala index 50f2fffb9..62ea20486 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/SqlTypesUtils.scala @@ -16,32 +16,38 @@ import com.rawlabs.compiler._ import scala.annotation.tailrec +// Types accepted in @type declarations: +// https://www.postgresql.org/docs/current/datatype-numeric.html object SqlTypesUtils { - // types accepted in @type declarations: - // https://www.postgresql.org/docs/current/datatype-numeric.html + // Prioritized list of number types + private val prioritizedNumberTypes = Vector( + java.sql.Types.DECIMAL, + java.sql.Types.NUMERIC, + java.sql.Types.DOUBLE, + java.sql.Types.FLOAT, + java.sql.Types.BIGINT, + java.sql.Types.INTEGER, + java.sql.Types.SMALLINT, + java.sql.Types.TINYINT + ) - def jdbcFromParameterType(typeName: String): Either[String, Int] = { - val pgMap: Map[String, Int] = Map( - "smallint" -> java.sql.Types.SMALLINT, - "integer" -> java.sql.Types.INTEGER, - "bigint" -> java.sql.Types.BIGINT, - "decimal" -> java.sql.Types.DECIMAL, - "real" -> java.sql.Types.FLOAT, - "double precision" -> java.sql.Types.DOUBLE, - "date" -> java.sql.Types.DATE, - "time" -> java.sql.Types.TIME, - "timestamp" -> java.sql.Types.TIMESTAMP, - "boolean" -> java.sql.Types.BOOLEAN, - "varchar" -> java.sql.Types.VARCHAR - ) - pgMap.get(typeName.strip.toLowerCase) match { - case Some(value) => Right(value) - case None => Left(s"unsupported type $typeName") - } - } + // Map from Postgres type names to JDBC types + private val pgMap: Map[String, Int] = Map( + "smallint" -> java.sql.Types.SMALLINT, + "integer" -> java.sql.Types.INTEGER, + "bigint" -> java.sql.Types.BIGINT, + "decimal" -> java.sql.Types.DECIMAL, + "real" -> java.sql.Types.FLOAT, + "double precision" -> java.sql.Types.DOUBLE, + "date" -> java.sql.Types.DATE, + "time" -> java.sql.Types.TIME, + "timestamp" -> java.sql.Types.TIMESTAMP, + "boolean" -> java.sql.Types.BOOLEAN, + "varchar" -> java.sql.Types.VARCHAR + ) - // a mapping from JDBC types to a RawType. We also store the name of the JDBC type for error reporting. + // Map from JDBC types to RawTypes private val jdbcToRawType: Map[Int, RawType] = Map( java.sql.Types.BIT -> RawBoolType(false, false), java.sql.Types.TINYINT -> RawByteType(false, false), @@ -83,8 +89,19 @@ object SqlTypesUtils { // java.sql.Types.TIMESTAMP_WITH_TIMEZONE -> ) - // renames the postgres type to what a user would need to write to match - // the actual type. Or return an error. + def jdbcFromParameterType(typeName: String): Either[String, Int] = { + pgMap.get(typeName.strip.toLowerCase) match { + case Some(value) => Right(value) + case None => Left(s"unsupported type $typeName") + } + } + + /** + * Validates and renames the parameter type and returns the PostgresType if it is valid. + * + * @param t the PostgresType to validate + * @return either an error message or the validated PostgresType + */ def validateParamType(t: PostgresType): Either[String, PostgresType] = { t.jdbcType match { case java.sql.Types.BIT | java.sql.Types.BOOLEAN => @@ -106,6 +123,12 @@ object SqlTypesUtils { } } + /** + * Returns the RawType corresponding to the given PostgresType. + * + * @param tipe the PostgresType to convert + * @return either an error message or the corresponding RawType + */ def rawTypeFromPgType(tipe: PostgresType): Either[String, RawType] = { val jdbcType = tipe.jdbcType val pgTypeName = tipe.typeName @@ -133,20 +156,15 @@ object SqlTypesUtils { } } - // This is merging the inferred types of parameters. For example, if a parameter is used as both - // a double and an int, it will be inferred as a double. It's very conservative and better rely on - // explicitly typed parameters. + /** + * Merges a sequence of PostgresTypes into a single PostgresType. + * For example, if a parameter is used as both a double and an int, it will be inferred as a double. + * It's very conservative and it's a;ways better rely on explicitly typed parameters. + * + * @param options the sequence of PostgresTypes to merge + * @return either an error message or the merged PostgresType + */ def mergePgTypes(options: Seq[PostgresType]): Either[String, PostgresType] = { - val prioritizedNumberTypes = Vector( - java.sql.Types.DECIMAL, - java.sql.Types.NUMERIC, - java.sql.Types.DOUBLE, - java.sql.Types.FLOAT, - java.sql.Types.BIGINT, - java.sql.Types.INTEGER, - java.sql.Types.SMALLINT, - java.sql.Types.TINYINT - ) @tailrec def recurse(tipes: Seq[PostgresType], current: PostgresType): Either[String, PostgresType] = { diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala deleted file mode 100644 index a66dbf75d..000000000 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitor.scala +++ /dev/null @@ -1,783 +0,0 @@ -/* - * Copyright 2024 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.sql.compiler.antlr4 - -import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange} -import com.rawlabs.sql.parser.generated.{PsqlParser, PsqlParserBaseVisitor} -import org.antlr.v4.runtime.ParserRuleContext -import org.antlr.v4.runtime.misc.Interval -import org.bitbucket.inkytonik.kiama.util.{Positions, Source} - -import scala.collection.JavaConverters._ -import scala.collection.mutable - -class RawSqlVisitor( - val positions: Positions, - params: mutable.Map[String, SqlParam], - private val source: Source, - private val errors: RawSqlVisitorParseErrors, - var returnDescription: Option[String] = None -) extends PsqlParserBaseVisitor[SqlBaseNode] { - - private val positionsWrapper = new RawSqlPositions(positions, source) - - private val assertionMessage = "Should never reach this node." - - private var isFirstStatement = true - - private def addError(message: String, ctx: ParserRuleContext): Unit = { - val offset = Option(ctx) - .flatMap(context => { - Option(context.children).flatMap(children => { - Option(children.get(children.size() - 1)).map(last => last.getText.length) - }) - }) - .getOrElse(0) - - errors.addError( - ErrorMessage( - message, - List( - ErrorRange( - ErrorPosition(ctx.getStart.getLine, ctx.getStart.getCharPositionInLine + 1), - ErrorPosition(ctx.getStop.getLine, ctx.getStop.getCharPositionInLine + offset + 1) - ) - ), - SqlParserErrors.ParserErrorCode - ) - ) - } - - def sourceTextForContext(context: ParserRuleContext): Option[String] = Option(context) - .map(context => { - val cs = context.getStart.getTokenSource.getInputStream - val stopIndex = - if (context.getStop != null) context.getStop.getStopIndex - else -1 - cs.getText(new Interval(context.getStart.getStartIndex, stopIndex)) - }) - - override def visitProg(ctx: PsqlParser.ProgContext): SqlBaseNode = { - isFirstStatement = true - Option(ctx).flatMap(context => Option(context.code()).map(codeCtx => visit(codeCtx))).getOrElse(SqlErrorNode()) - } - - override protected def defaultResult(): SqlErrorNode = { - SqlErrorNode(); - } - - override def visitCode(ctx: PsqlParser.CodeContext): SqlBaseNode = Option(ctx) - .map { context => - val statement = Option(context.stmt()) - .flatMap(st => - Option(st.get(0)) - .map(s => { - val res = visit(s) - positionsWrapper.setPosition(ctx, res) - res - }) - ) - .getOrElse(SqlErrorNode()) - - // set a flag to ignore comment internals - isFirstStatement = false - - Option(context.stmt()) - .map(m => - m.asScala.tail.map(md => - Option(md) - .flatMap(mdContext => - Option(visit(mdContext)).map { - case stmt: SqlStatementNode => if (!stmt.statementItems.forall(_.isInstanceOf[SqlCommentNode])) - addError("Only one statement is allowed", md) - } - ) - ) - ) - - val prog = SqlProgramNode(statement) - positionsWrapper.setPosition(ctx, prog) - prog - } - .getOrElse(SqlErrorNode()) - - override def visitComment(ctx: PsqlParser.CommentContext): SqlBaseNode = Option(ctx) - .flatMap { context => - // if in first statement we visit children - if (isFirstStatement) - Option(context.multiline_comment()).map(visit).orElse(Option(context.singleline_comment()).map(visit)) - // In second we ignore them - else Some(SqlMultiLineCommentNode(Vector.empty)) - } - .getOrElse(SqlErrorNode()) - - override def visitSingleLineComment(ctx: PsqlParser.SingleLineCommentContext): SqlBaseNode = Option(ctx) - .map { context => - val singleLineComment = SqlSingleLineCommentNode(visit(context.singleline_value_comment())) - positionsWrapper.setPosition(ctx, singleLineComment) - singleLineComment - } - .getOrElse(SqlErrorNode()) - - override def visitSingleLineCommentEOF(ctx: PsqlParser.SingleLineCommentEOFContext): SqlBaseNode = Option(ctx) - .map { context => - val singleLineComment = SqlSingleLineCommentNode(visit(context.singleline_value_comment())) - positionsWrapper.setPosition(ctx.getStart, ctx.singleline_value_comment().getStop, singleLineComment) - singleLineComment - } - .getOrElse(SqlErrorNode()) - - override def visitSingleParamComment(ctx: PsqlParser.SingleParamCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.singleline_param_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitSingleTypeComment(ctx: PsqlParser.SingleTypeCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.singleline_type_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitSingleReturnComment(ctx: PsqlParser.SingleReturnCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.singleline_return_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitSingleDefaultComment(ctx: PsqlParser.SingleDefaultCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.singleline_default_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitSingleUnknownTypeComment(ctx: PsqlParser.SingleUnknownTypeCommentContext): SqlBaseNode = { - Option(ctx) - .foreach(context => - addError( - "Unknown param annotation the only keywords allowed are @param, @return, @type, @default", - context - ) - ) - SqlErrorNode() - } - - override def visitSingleNormalComment(ctx: PsqlParser.SingleNormalCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.singleline_normal_comment_value()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitSingleline_param_comment(ctx: PsqlParser.Singleline_param_commentContext): SqlBaseNode = Option(ctx) - .map(context => { - if (context.SL_WORD(0) == null) { - addError("Missing parameter name for syntax @param ", context) - SqlErrorNode() - } else { - val name = context.SL_WORD(0).getText.trim - val nextLinesComments = " " + Option( - context - .singleline_normal_comment_value() - .asScala - .map(snc => snc.SL_WORD().asScala.map(w => w.getText).mkString(" ")) - .toVector - .mkString(" ") - ).getOrElse("") - val description = (context.SL_WORD().asScala.drop(1).map(_.getText).mkString(" ") + nextLinesComments).trim - val paramDefComment = SqlParamDefCommentNode(name, description) - positionsWrapper.setPosition(ctx, paramDefComment) - - // check for duplication - params.get(name) match { - case Some(value) => - val existsParamDef = value.nodes.exists { - case _: SqlParamDefCommentNode => true - case _ => false - } - if (existsParamDef) addError(s"Duplicate parameter definition for $name", context) - else - params.update(name, value.copy(description = Some(description), nodes = value.nodes :+ paramDefComment)) - case None => - params += (name -> SqlParam(name, Some(description), None, None, Vector(paramDefComment), Vector.empty)) - } - - paramDefComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitSingleline_type_comment(ctx: PsqlParser.Singleline_type_commentContext): SqlBaseNode = Option(ctx) - .map(context => { - if (context.SL_WORD(0) == null) { - addError("Missing name for syntax @type ", context) - SqlErrorNode() - } else if (context.SL_WORD.size() <= 1) { - addError("Missing type name for syntax @type ", context) - SqlErrorNode() - } else { - val name = context.SL_WORD(0).getText.trim - val tipe = context.SL_WORD.asScala.tail.map(_.getText.trim).mkString(" ") - val paramTypeComment = SqlParamTypeCommentNode(name, tipe) - positionsWrapper.setPosition(ctx, paramTypeComment) - - // check for duplication - params.get(name) match { - case Some(value) => - val existsParamType = value.nodes.exists { - case _: SqlParamTypeCommentNode => true - case _ => false - } - if (existsParamType) addError(s"Duplicate parameter type definition for $name", context) - else params.update(name, value.copy(tipe = Some(tipe), nodes = value.nodes :+ paramTypeComment)) - case None => - params += (name -> SqlParam(name, None, Some(tipe), None, Vector(paramTypeComment), Vector.empty)) - } - - paramTypeComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitSingleline_default_comment(ctx: PsqlParser.Singleline_default_commentContext): SqlBaseNode = Option( - ctx - ) - .map(context => { - if (context.SL_WORD(0) == null) { - addError("Missing name for syntax @default ", context) - SqlErrorNode() - } else if (context.SL_WORD.size() <= 1) { - addError("Missing default value for syntax @default ", context) - SqlErrorNode() - } else { - val name = context.SL_WORD(0).getText.trim - val defaultValue = context.SL_WORD.asScala.tail.map(_.getText.trim).mkString(" ") - val paramDefaultComment = SqlParamDefaultCommentNode(name, defaultValue) - positionsWrapper.setPosition(ctx, paramDefaultComment) - - // check for duplication - params.get(name) match { - case Some(value) => - val existsParamDefault = value.nodes.exists { - case _: SqlParamDefaultCommentNode => true - case _ => false - } - if (existsParamDefault) addError(s"Duplicate parameter default definition for $name", context) - else - params.update(name, value.copy(default = Some(defaultValue), nodes = value.nodes :+ paramDefaultComment)) - case None => params += (name -> SqlParam( - name, - None, - None, - Some(defaultValue), - Vector(paramDefaultComment), - Vector.empty - )) - } - - paramDefaultComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitSingleline_return_comment(ctx: PsqlParser.Singleline_return_commentContext): SqlBaseNode = Option( - ctx - ) - .map(context => { - if (context.SL_WORD(0) == null) { - addError("Missing description for syntax @return ", context) - SqlErrorNode() - } else { - val nextLinesComments = " " + Option( - context - .singleline_normal_comment_value() - .asScala - .map(snc => snc.SL_WORD().asScala.map(w => w.getText).mkString(" ")) - .toVector - .mkString(" ") - ).getOrElse("") - val description = (context.SL_WORD().asScala.map(_.getText).mkString(" ") + nextLinesComments).trim - val paramReturnsComment = SqlParamReturnsCommentNode(description) - positionsWrapper.setPosition(ctx, paramReturnsComment) - - returnDescription match { - case Some(_) => addError("Duplicate return description", context) - case None => returnDescription = Some(description) - } - - paramReturnsComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitSingleline_normal_comment_value( - ctx: PsqlParser.Singleline_normal_comment_valueContext - ): SqlBaseNode = Option( - ctx - ) - .map(context => { - val value = context.getText - val normalComment = SqlNormalCommentNode(value) - positionsWrapper.setPosition(ctx, normalComment) - normalComment - }) - .getOrElse(SqlErrorNode()) - - override def visitMultiline_comment(ctx: PsqlParser.Multiline_commentContext): SqlBaseNode = Option(ctx) - .map { context => - val multilineComments = Option(context.multiline_value_comment()) - .map(m => - m.asScala.map(md => - Option(md) - .flatMap(mdContext => Option(visit(mdContext))) - .getOrElse(SqlErrorNode()) - .asInstanceOf[SqlBaseNode] - ) - ) - .getOrElse(Vector.empty) - .toVector - val multiLineComment = SqlMultiLineCommentNode(multilineComments) - positionsWrapper.setPosition(ctx, multiLineComment) - multiLineComment - } - .getOrElse(SqlErrorNode()) - - override def visitMultilineParamComment(ctx: PsqlParser.MultilineParamCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.multiline_param_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitMultilineTypeComment(ctx: PsqlParser.MultilineTypeCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.multiline_type_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitMultilineDefaultComment(ctx: PsqlParser.MultilineDefaultCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.multiline_default_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitMultilineReturnComment(ctx: PsqlParser.MultilineReturnCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.multiline_return_comment()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitMultilineUnknownTypeComment(ctx: PsqlParser.MultilineUnknownTypeCommentContext): SqlBaseNode = { - Option(ctx) - .foreach(context => - addError( - "Unknown param annotation the only keywords allowed are @param, @return, @type, @default", - context - ) - ) - SqlErrorNode() - } - - override def visitMultilineNormalComment(ctx: PsqlParser.MultilineNormalCommentContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.multiline_normal_comment_value()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitMultiline_param_comment(ctx: PsqlParser.Multiline_param_commentContext): SqlBaseNode = Option(ctx) - .map(context => { - if (context.multiline_word_or_star(0) == null) { - addError("Missing parameter name for syntax @param ", context) - SqlErrorNode() - } else { - val name = context.multiline_word_or_star(0).getText - val description = context.multiline_word_or_star().asScala.drop(1).map(_.getText).mkString(" ") - val paramDefComment = SqlParamDefCommentNode(name, description) - positionsWrapper.setPosition(ctx, paramDefComment) - - // check for duplication - params.get(name) match { - case Some(value) => - val existsParamDef = value.nodes.exists { - case _: SqlParamDefCommentNode => true - case _ => false - } - if (existsParamDef) addError(s"Duplicate parameter definition for $name", context) - else - params.update(name, value.copy(description = Some(description), nodes = value.nodes :+ paramDefComment)) - case None => - params += (name -> SqlParam(name, Some(description), None, None, Vector(paramDefComment), Vector.empty)) - } - - paramDefComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitMultiline_type_comment(ctx: PsqlParser.Multiline_type_commentContext): SqlBaseNode = Option(ctx) - .map(context => { - if (context.multiline_word_or_star(0) == null) { - addError("Missing name for syntax @type ", context) - SqlErrorNode() - } else if (context.multiline_word_or_star.size() <= 1) { - addError("Missing type name for syntax @type ", context) - SqlErrorNode() - } else { - val name = context.multiline_word_or_star(0).getText.trim - val tipe = context.multiline_word_or_star.asScala.tail.map(_.getText.trim).mkString(" ") - val paramTypeComment = SqlParamTypeCommentNode(name, tipe) - positionsWrapper.setPosition(ctx, paramTypeComment) - - // check for duplication - params.get(name) match { - case Some(value) => - val existsParamType = value.nodes.exists { - case _: SqlParamTypeCommentNode => true - case _ => false - } - if (existsParamType) addError(s"Duplicate parameter type definition for $name", context) - else params.update(name, value.copy(tipe = Some(tipe), nodes = value.nodes :+ paramTypeComment)) - case None => - params += (name -> SqlParam(name, None, Some(tipe), None, Vector(paramTypeComment), Vector.empty)) - } - - paramTypeComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitMultiline_default_comment(ctx: PsqlParser.Multiline_default_commentContext): SqlBaseNode = Option( - ctx - ) - .map(context => { - if (context.multiline_word_or_star(0) == null) { - addError("Missing name for syntax @default ", context) - SqlErrorNode() - } else if (context.multiline_word_or_star.size() <= 1) { - addError("Missing default value for syntax @default ", context) - SqlErrorNode() - } else { - val name = context.multiline_word_or_star(0).getText - val defaultValue = context.multiline_word_or_star.asScala.tail.map(_.getText.trim).mkString(" ") - val paramDefaultComment = SqlParamDefaultCommentNode(name, defaultValue) - positionsWrapper.setPosition(ctx, paramDefaultComment) - - // check for duplication - params.get(name) match { - case Some(value) => - val existsParamDefault = value.nodes.exists { - case _: SqlParamDefaultCommentNode => true - case _ => false - } - if (existsParamDefault) addError(s"Duplicate parameter default definition for $name", context) - else - params.update(name, value.copy(default = Some(defaultValue), nodes = value.nodes :+ paramDefaultComment)) - case None => params += (name -> SqlParam( - name, - None, - None, - Some(defaultValue), - Vector(paramDefaultComment), - Vector.empty - )) - } - - paramDefaultComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitMultiline_return_comment(ctx: PsqlParser.Multiline_return_commentContext): SqlBaseNode = Option( - ctx - ) - .map(context => { - if (context.multiline_word_or_star(0) == null) { - addError("Missing description for syntax @return ", context) - SqlErrorNode() - } else { - val description = context.multiline_word_or_star().asScala.map(_.getText).mkString(" ") - val paramReturnsComment = SqlParamReturnsCommentNode(description) - positionsWrapper.setPosition(ctx, paramReturnsComment) - - returnDescription match { - case Some(_) => addError("Duplicate return description", context) - case None => returnDescription = Some(description) - } - - paramReturnsComment - } - }) - .getOrElse(SqlErrorNode()) - - override def visitMultiline_normal_comment_value(ctx: PsqlParser.Multiline_normal_comment_valueContext): SqlBaseNode = - Option( - ctx - ) - .map(context => { - val value = context.getText - val normalComment = SqlNormalCommentNode(value) - positionsWrapper.setPosition(ctx, normalComment) - normalComment - }) - .getOrElse(SqlErrorNode()) - - override def visitStmtItems(ctx: PsqlParser.StmtItemsContext): SqlBaseNode = Option(ctx) - .map { context => - val statements = Option(context.stmt_items()) - .map(s => - s.asScala.map(st => - Option(st) - .flatMap(mdContext => Option(visit(mdContext))) - .getOrElse(SqlErrorNode()) - .asInstanceOf[SqlBaseNode] - ) - ) - .getOrElse(Vector.empty) - .toVector - val last = ctx.stmt_items().getLast.getStop - val first = ctx.getStart - val stmt = SqlStatementNode(statements) - positionsWrapper.setPosition(first, last, stmt) - stmt - } - .getOrElse(SqlErrorNode()) - - override def visitParenStmt(ctx: PsqlParser.ParenStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.stmt()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitParenStmtSqureBr(ctx: PsqlParser.ParenStmtSqureBrContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.stmt()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitNestedStmtSqureBr(ctx: PsqlParser.NestedStmtSqureBrContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.stmt()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitFunCallStmt(ctx: PsqlParser.FunCallStmtContext): SqlBaseNode = Option(ctx) - .map { context => - val name = Option(context.idnt()) - .map(i => i.getText) - .getOrElse(context.reserved_keyword().getText) - val arguments = Option(context.stmt_items()) - .map(visit) - val funCall = SqlFunctionCall(name, arguments) - positionsWrapper.setPosition(ctx, funCall) - funCall - } - .getOrElse(SqlErrorNode()) - - override def visitUnknownStmt(ctx: PsqlParser.UnknownStmtContext): SqlBaseNode = Option(ctx) - .map { context => - val unknown = SqlUnknownNode(context.getText) - positionsWrapper.setPosition(ctx, unknown) - unknown - } - .getOrElse(SqlErrorNode()) - - override def visitCommaSeparated(ctx: PsqlParser.CommaSeparatedContext): SqlBaseNode = Option(ctx) - .map { context => - val statements = Option(context.stmt_items()) - .map(s => - s.asScala.map(st => - Option(st) - .flatMap(mdContext => Option(visit(mdContext))) - .getOrElse(SqlErrorNode()) - .asInstanceOf[SqlBaseNode] - ) - ) - .getOrElse(Vector.empty) - .toVector - val withComaSeparator = SqlWithComaSeparatorNode(statements) - positionsWrapper.setPosition(ctx, withComaSeparator) - withComaSeparator - } - .getOrElse(SqlErrorNode()) - - override def visitTypeCast(ctx: PsqlParser.TypeCastContext): SqlBaseNode = Option(ctx) - .flatMap { context => - Option(context.stmt_items()).map { items => - val stmt = Option(items.get(0)).map(visit).getOrElse(SqlErrorNode()) - val tipe = Option(items.get(1)).map(visit).getOrElse(SqlErrorNode()) - val typeCast = SqlTypeCastNode(stmt, tipe) - positionsWrapper.setPosition(ctx, typeCast) - typeCast - } - } - .getOrElse(SqlErrorNode()) - - override def visitNestedStmt(ctx: PsqlParser.NestedStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.stmt()).map(visit)) - .getOrElse(SqlErrorNode()) - - // override def visitParenStmtItems(ctx: PsqlParser.ParenStmtItemsContext): SqBaseNode = Option(ctx) -// .flatMap(context => Option(context.stmt_items()).map(visit)) -// .getOrElse(SqlErrorNode()) - - override def visitProjStmt(ctx: PsqlParser.ProjStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.proj()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitLiteralStmt(ctx: PsqlParser.LiteralStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.literal()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitKeywordStmt(ctx: PsqlParser.KeywordStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.reserved_keyword()).map(visit)) - .getOrElse(SqlErrorNode()) - -// override def visitBinaryExpStmt(ctx: PsqlParser.BinaryExpStmtContext): SqBaseNode = Option(ctx) -// .flatMap(context => Option(context.binary_exp()).map(visit)) -// .getOrElse(SqlErrorNode()) - - override def visitIdntStmt(ctx: PsqlParser.IdntStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.idnt()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitParamStmt(ctx: PsqlParser.ParamStmtContext): SqlBaseNode = Option(ctx) - .map(context => { - val name = context.getText.replace(":", "") - val param = SqlParamUseNode(name) - - param match { - case use: SqlParamUseNode => params.get(use.name) match { - case Some(value) => params.update(use.name, value.copy(occurrences = value.occurrences :+ use)) - case None => params += (use.name -> SqlParam(use.name, None, None, None, Vector.empty, Vector(use))) - } - case _ => - } - positionsWrapper.setPosition(ctx, param) - param - }) - .getOrElse(SqlErrorNode()) - -// override def visitKeyword(ctx: PsqlParser.KeywordContext): SqlBaseNode = Option(ctx) -// .map { context => -// val keyword = SqlKeywordNode(context.getText) -// positionsWrapper.setPosition(ctx, keyword) -// keyword -// } -// .getOrElse(SqlErrorNode()) - - override def visitReserved_keyword(ctx: PsqlParser.Reserved_keywordContext): SqlBaseNode = Option(ctx) - .map { context => - val keyword = SqlKeywordNode(context.getText) - positionsWrapper.setPosition(ctx, keyword) - keyword - } - .getOrElse(SqlErrorNode()) - - override def visitOperator(ctx: PsqlParser.OperatorContext): SqlBaseNode = Option(ctx) - .map { context => - val operator = SqlOperatorNode(context.getText) - positionsWrapper.setPosition(ctx, operator) - operator - } - .getOrElse(SqlErrorNode()) - - override def visitOperatorStmt(ctx: PsqlParser.OperatorStmtContext): SqlBaseNode = Option(ctx) - .flatMap(context => Option(context.operator()).map(visit)) - .getOrElse(SqlErrorNode()) - - override def visitProperProj(ctx: PsqlParser.ProperProjContext): SqlBaseNode = Option(ctx) - .map { context => - val identifiers = Option(context.idnt()) - .map(i => - i.asScala.map(idn => - Option(idn) - .flatMap(mdContext => Option(visit(mdContext))) - .getOrElse(SqlErrorNode()) - .asInstanceOf[SqlBaseNode] - ) - ) - .getOrElse(Vector.empty) - .toVector - val proj = SqlProjNode(identifiers) - positionsWrapper.setPosition(ctx, proj) - proj - } - .getOrElse(SqlErrorNode()) - - override def visitMissingIdenProj(ctx: PsqlParser.MissingIdenProjContext): SqlBaseNode = Option(ctx) - .map { context => - val identifier = Option(context.idnt()) - .map(visit) - .getOrElse(SqlErrorNode()) - val proj = SqlProjNode(Vector(identifier)) - positionsWrapper.setPosition(ctx, proj) - proj - } - .getOrElse(SqlErrorNode()) - - override def visitIdnt(ctx: PsqlParser.IdntContext): SqlBaseNode = Option(ctx) - .map { context => - val isDoubleQuoted = context.STRING_IDENTIFIER_START() != null - val value = - if (isDoubleQuoted) { - val text = context.getText - val withoutLast = - if (!text.endsWith("\"")) { - addError("Missing closing \"", context) - text - } else text.dropRight(1) - withoutLast.drop(1) - } else context.getText - val idnt = SqlIdentifierNode(value, isDoubleQuoted) - positionsWrapper.setPosition(ctx, idnt) - idnt - } - .getOrElse(SqlErrorNode()) - - override def visitStringLiteral(ctx: PsqlParser.StringLiteralContext): SqlBaseNode = Option(ctx) - .map { context => - val value = context.getText - val stringLiteral = SqlStringLiteralNode(value) - positionsWrapper.setPosition(ctx, stringLiteral) - stringLiteral - } - .getOrElse(SqlErrorNode()) - - override def visitIntegerLiteral(ctx: PsqlParser.IntegerLiteralContext): SqlBaseNode = Option(ctx) - .map { context => - val value = context.getText - val intLiteral = SqlIntLiteralNode(value) - positionsWrapper.setPosition(ctx, intLiteral) - intLiteral - } - .getOrElse(SqlErrorNode()) - - override def visitFloatingPointLiteral(ctx: PsqlParser.FloatingPointLiteralContext): SqlBaseNode = Option(ctx) - .map { context => - val value = context.getText - val floatingPointLiteral = SqlFloatingPointLiteralNode(value) - positionsWrapper.setPosition(ctx, floatingPointLiteral) - floatingPointLiteral - } - .getOrElse(SqlErrorNode()) - - override def visitBooleanLiteral(ctx: PsqlParser.BooleanLiteralContext): SqlBaseNode = Option(ctx) - .map { context => - val value = context.getText - val booleanLiteral = SqlBooleanLiteralNode(value) - positionsWrapper.setPosition(ctx, booleanLiteral) - booleanLiteral - } - .getOrElse(SqlErrorNode()) - - override def visitTipe(ctx: PsqlParser.TipeContext): SqlBaseNode = Option(ctx) - .map { context => - val tipe = SqlTypeNode(context.getText) - positionsWrapper.setPosition(ctx, tipe) - tipe - } - .getOrElse(SqlErrorNode()) - - override def visitCommentStmt(ctx: PsqlParser.CommentStmtContext): SqlBaseNode = super.visitCommentStmt(ctx) - - override def visitTypeStmt(ctx: PsqlParser.TypeStmtContext): SqlBaseNode = super.visitTypeStmt(ctx) - - // ignored - override def visitPsql_type(ctx: PsqlParser.Psql_typeContext): SqlBaseNode = - throw new AssertionError(assertionMessage) - - override def visitSingleline_unknown_type_comment( - ctx: PsqlParser.Singleline_unknown_type_commentContext - ): SqlBaseNode = throw new AssertionError(assertionMessage) - - override def visitMultiline_unknown_type_comment(ctx: PsqlParser.Multiline_unknown_type_commentContext): SqlBaseNode = - throw new AssertionError(assertionMessage) - - override def visitNon_reserved_keyword(ctx: PsqlParser.Non_reserved_keywordContext): SqlBaseNode = - throw new AssertionError(assertionMessage) - - override def visitMultiline_word_or_star(ctx: PsqlParser.Multiline_word_or_starContext): SqlBaseNode = - throw new AssertionError(assertionMessage) -} diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlErrorListener.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlErrorListener.scala similarity index 90% rename from sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlErrorListener.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlErrorListener.scala index dc7265c62..b9629a0fb 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlErrorListener.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlErrorListener.scala @@ -15,9 +15,11 @@ package com.rawlabs.sql.compiler.antlr4 import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange, Message} import org.antlr.v4.runtime.{BaseErrorListener, RecognitionException, Recognizer, Token} -class RawSqlErrorListener() extends BaseErrorListener { +import scala.collection.mutable - private var errors = List[Message]() +class SqlErrorListener extends BaseErrorListener { + + private val errors = new mutable.ListBuffer[Message] private def improveErrorMessage(msg: String): String = { val extraneousPattern = "extraneous input '(.+)' expecting \\{(.*?)}".r @@ -69,9 +71,11 @@ class RawSqlErrorListener() extends BaseErrorListener { ErrorPosition(line, getCharPositionInLinePlusOne + 1) ) } - errors = errors :+ ErrorMessage(improveErrorMessage(msg), List(positions), SqlParserErrors.ParserErrorCode) + errors.append(ErrorMessage(improveErrorMessage(msg), List(positions), SqlParserErrors.ParserErrorCode)) } - def getErrors: List[Message] = errors + def getErrors: List[Message] = errors.to + def hasErrors: Boolean = errors.nonEmpty + } diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala index 5d9b13905..19a9eabcf 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlNodes.scala @@ -12,17 +12,17 @@ package com.rawlabs.sql.compiler.antlr4 -trait SqlBaseNode extends Product +sealed trait SqlBaseNode extends Product final case class SqlProgramNode(statement: SqlBaseNode) extends SqlBaseNode -// A comment can be a single line or a multi line comment -// The values that we are interested in are the subComments which are "@param", "@return", "@type", "@default" -trait SqlCommentNode extends SqlBaseNode +// A comment can be a single line or a multi-line. +// The values that we are interested in are the subComments which are "@param", "@return", "@type", "@default". +sealed trait SqlCommentNode extends SqlBaseNode final case class SqlSingleLineCommentNode(subComment: SqlBaseNode) extends SqlCommentNode final case class SqlMultiLineCommentNode(subComments: Vector[SqlBaseNode]) extends SqlCommentNode -trait SqlSubCommentNode extends SqlBaseNode +sealed trait SqlSubCommentNode extends SqlBaseNode final case class SqlParamDefCommentNode(name: String, description: String) extends SqlSubCommentNode final case class SqlParamTypeCommentNode(name: String, tipe: String) extends SqlSubCommentNode final case class SqlParamDefaultCommentNode(name: String, value: String) extends SqlSubCommentNode @@ -31,13 +31,13 @@ final case class SqlNormalCommentNode(value: String) extends SqlSubCommentNode final case class SqlStatementNode(statementItems: Vector[SqlBaseNode]) extends SqlBaseNode -trait SqlStatementItemNode extends SqlBaseNode +sealed trait SqlStatementItemNode extends SqlBaseNode sealed trait SqlIdnNode extends SqlStatementItemNode final case class SqlProjNode(identifiers: Vector[SqlBaseNode]) extends SqlIdnNode final case class SqlIdentifierNode(name: String, isQuoted: Boolean) extends SqlIdnNode -trait SqlLiteralNode extends SqlStatementItemNode +sealed trait SqlLiteralNode extends SqlStatementItemNode final case class SqlStringLiteralNode(value: String) extends SqlLiteralNode final case class SqlIntLiteralNode(value: String) extends SqlLiteralNode final case class SqlFloatingPointLiteralNode(value: String) extends SqlLiteralNode diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala index 1fbca9902..b5c93625c 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlParam.scala @@ -13,7 +13,8 @@ package com.rawlabs.sql.compiler.antlr4 /** - * Represents a parameter in a SQL program + * Represents a parameter in a SQL program. + * * @param name the name of the parameter * @param description the description of the parameter * @param tipe the type of the parameter @@ -21,7 +22,7 @@ package com.rawlabs.sql.compiler.antlr4 * @param nodes tree nodes where the parameter is defined, used for deduplication * @param occurrences tree nodes where the parameter occurs */ -case class SqlParam( +final case class SqlParam( name: String, description: Option[String], tipe: Option[String], diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlPositions.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlPositions.scala similarity index 86% rename from sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlPositions.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlPositions.scala index f977b046b..514a6e5c5 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlPositions.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlPositions.scala @@ -15,10 +15,10 @@ package com.rawlabs.sql.compiler.antlr4 import org.antlr.v4.runtime.{ParserRuleContext, Token} import org.bitbucket.inkytonik.kiama.util.{Position, Positions, Source} -class RawSqlPositions(positions: Positions, source: Source) { +class SqlPositions(positions: Positions, source: Source) { /** - * * Sets the position of the node in the position map based on start and end of a + * Sets the position of the node in the position map based on start and end of a * ParserRuleContext object * * @param ctx the context to get the position from @@ -39,7 +39,7 @@ class RawSqlPositions(positions: Positions, source: Source) { } /** - * * Sets the position of the node in the position map based on start and end of a Token object + * Sets the position of the node in the position map based on start and end of a Token object. * * @param token the token to get the position from * @param node the node to store in the positions map @@ -55,7 +55,7 @@ class RawSqlPositions(positions: Positions, source: Source) { } /** - * * Sets the position of the node in the position map based on start token and end token object + * Sets the position of the node in the position map based on start token and end token object * * @param startToken start of the position * @param endToken end of the position diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlSyntaxAnalyzer.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlSyntaxAnalyzer.scala similarity index 86% rename from sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlSyntaxAnalyzer.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlSyntaxAnalyzer.scala index 2d2285f73..b3dc84ac7 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlSyntaxAnalyzer.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlSyntaxAnalyzer.scala @@ -21,10 +21,11 @@ import org.bitbucket.inkytonik.kiama.util.{Positions, StringSource} import scala.collection.mutable -class RawSqlSyntaxAnalyzer(val positions: Positions) extends Parsers(positions) { +class SqlSyntaxAnalyzer(val positions: Positions) extends Parsers(positions) { + def parse(s: String): ParseProgramResult = { val source = StringSource(s) - val rawErrorListener = new RawSqlErrorListener() + val rawErrorListener = new SqlErrorListener() val striped = s.stripTrailing() val lexer = new PsqlLexer(CharStreams.fromString(striped)) @@ -37,13 +38,14 @@ class RawSqlSyntaxAnalyzer(val positions: Positions) extends Parsers(positions) parser.addErrorListener(rawErrorListener) val tree: ParseTree = parser.prog - val visitorParseErrors = RawSqlVisitorParseErrors() + val visitorParseErrors = new SqlVisitorParseErrors val params = mutable.Map.empty[String, SqlParam] - val visitor = new RawSqlVisitor(positions, params, source, visitorParseErrors) + val visitor = new SqlVisitor(positions, params, source, visitorParseErrors) val result = visitor.visit(tree).asInstanceOf[SqlProgramNode] val totalErrors = rawErrorListener.getErrors ++ visitorParseErrors.getErrors ParseProgramResult(totalErrors, params, visitor.returnDescription, result, positions) } + } final case class ParseProgramResult( diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitor.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitor.scala new file mode 100644 index 000000000..3beaf8c14 --- /dev/null +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitor.scala @@ -0,0 +1,900 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.sql.compiler.antlr4 + +import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange} +import com.rawlabs.sql.parser.generated.{PsqlParser, PsqlParserBaseVisitor} +import org.antlr.v4.runtime.ParserRuleContext +import org.antlr.v4.runtime.misc.Interval +import org.bitbucket.inkytonik.kiama.util.{Positions, Source} + +import scala.collection.JavaConverters._ +import scala.collection.mutable + +class SqlVisitor( + val positions: Positions, + params: mutable.Map[String, SqlParam], + private val source: Source, + private val errors: SqlVisitorParseErrors, + var returnDescription: Option[String] = None +) extends PsqlParserBaseVisitor[SqlBaseNode] { + + private val positionsWrapper = new SqlPositions(positions, source) + + private val assertionMessage = "Should never reach this node." + + private var isFirstStatement = true + + private def addError(message: String, ctx: ParserRuleContext): Unit = { + val offset = Option(ctx) + .flatMap(context => { + Option(context.children).flatMap(children => { + Option(children.get(children.size() - 1)).map(last => last.getText.length) + }) + }) + .getOrElse(0) + + errors.addError( + ErrorMessage( + message, + List( + ErrorRange( + ErrorPosition(ctx.getStart.getLine, ctx.getStart.getCharPositionInLine + 1), + ErrorPosition(ctx.getStop.getLine, ctx.getStop.getCharPositionInLine + offset + 1) + ) + ), + SqlParserErrors.ParserErrorCode + ) + ) + } + + def sourceTextForContext(context: ParserRuleContext): Option[String] = { + Option(context) + .map(context => { + val cs = context.getStart.getTokenSource.getInputStream + val stopIndex = + if (context.getStop != null) context.getStop.getStopIndex + else -1 + cs.getText(new Interval(context.getStart.getStartIndex, stopIndex)) + }) + } + + override def visitProg(ctx: PsqlParser.ProgContext): SqlBaseNode = { + isFirstStatement = true + Option(ctx).flatMap(context => Option(context.code()).map(codeCtx => visit(codeCtx))).getOrElse(SqlErrorNode()) + } + + override protected def defaultResult(): SqlErrorNode = { + SqlErrorNode(); + } + + override def visitCode(ctx: PsqlParser.CodeContext): SqlBaseNode = { + Option(ctx) + .map { context => + val statement = Option(context.stmt()) + .flatMap(st => + Option(st.get(0)) + .map(s => { + val res = visit(s) + positionsWrapper.setPosition(ctx, res) + res + }) + ) + .getOrElse(SqlErrorNode()) + + // set a flag to ignore comment internals + isFirstStatement = false + + Option(context.stmt()) + .map(m => + m.asScala.tail.map(md => + Option(md) + .flatMap(mdContext => + Option(visit(mdContext)).map { + case stmt: SqlStatementNode => if (!stmt.statementItems.forall(_.isInstanceOf[SqlCommentNode])) { + addError("Only one statement is allowed", md) + } + case other => throw new AssertionError(s"Unexpected node type: $other") + } + ) + ) + ) + + val prog = SqlProgramNode(statement) + positionsWrapper.setPosition(ctx, prog) + prog + } + .getOrElse(SqlErrorNode()) + } + + override def visitComment(ctx: PsqlParser.CommentContext): SqlBaseNode = { + Option(ctx) + .flatMap { context => + // if in first statement we visit children + if (isFirstStatement) + Option(context.multiline_comment()).map(visit).orElse(Option(context.singleline_comment()).map(visit)) + // In second we ignore them + else Some(SqlMultiLineCommentNode(Vector.empty)) + } + .getOrElse(SqlErrorNode()) + } + + override def visitSingleLineComment(ctx: PsqlParser.SingleLineCommentContext): SqlBaseNode = { + Option(ctx) + .map { context => + val singleLineComment = SqlSingleLineCommentNode(visit(context.singleline_value_comment())) + positionsWrapper.setPosition(ctx, singleLineComment) + singleLineComment + } + .getOrElse(SqlErrorNode()) + } + + override def visitSingleLineCommentEOF(ctx: PsqlParser.SingleLineCommentEOFContext): SqlBaseNode = { + Option(ctx) + .map { context => + val singleLineComment = SqlSingleLineCommentNode(visit(context.singleline_value_comment())) + positionsWrapper.setPosition(ctx.getStart, ctx.singleline_value_comment().getStop, singleLineComment) + singleLineComment + } + .getOrElse(SqlErrorNode()) + } + + override def visitSingleParamComment(ctx: PsqlParser.SingleParamCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.singleline_param_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleTypeComment(ctx: PsqlParser.SingleTypeCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.singleline_type_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleReturnComment(ctx: PsqlParser.SingleReturnCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.singleline_return_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleDefaultComment(ctx: PsqlParser.SingleDefaultCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.singleline_default_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleUnknownTypeComment(ctx: PsqlParser.SingleUnknownTypeCommentContext): SqlBaseNode = { + Option(ctx) + .foreach(context => + addError( + "Unknown param annotation the only keywords allowed are @param, @return, @type, @default", + context + ) + ) + SqlErrorNode() + } + + override def visitSingleNormalComment(ctx: PsqlParser.SingleNormalCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.singleline_normal_comment_value()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleline_param_comment(ctx: PsqlParser.Singleline_param_commentContext): SqlBaseNode = { + Option(ctx) + .map(context => { + if (context.SL_WORD(0) == null) { + addError("Missing parameter name for syntax @param ", context) + SqlErrorNode() + } else { + val name = context.SL_WORD(0).getText.trim + val nextLinesComments = " " + Option( + context + .singleline_normal_comment_value() + .asScala + .map(snc => snc.SL_WORD().asScala.map(w => w.getText).mkString(" ")) + .toVector + .mkString(" ") + ).getOrElse("") + val description = (context.SL_WORD().asScala.drop(1).map(_.getText).mkString(" ") + nextLinesComments).trim + val paramDefComment = SqlParamDefCommentNode(name, description) + positionsWrapper.setPosition(ctx, paramDefComment) + + // check for duplication + params.get(name) match { + case Some(value) => + val existsParamDef = value.nodes.exists { + case _: SqlParamDefCommentNode => true + case _ => false + } + if (existsParamDef) addError(s"Duplicate parameter definition for $name", context) + else + params.update(name, value.copy(description = Some(description), nodes = value.nodes :+ paramDefComment)) + case None => + params += (name -> SqlParam(name, Some(description), None, None, Vector(paramDefComment), Vector.empty)) + } + + paramDefComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleline_type_comment(ctx: PsqlParser.Singleline_type_commentContext): SqlBaseNode = { + Option(ctx) + .map(context => { + if (context.SL_WORD(0) == null) { + addError("Missing name for syntax @type ", context) + SqlErrorNode() + } else if (context.SL_WORD.size() <= 1) { + addError("Missing type name for syntax @type ", context) + SqlErrorNode() + } else { + val name = context.SL_WORD(0).getText.trim + val tipe = context.SL_WORD.asScala.tail.map(_.getText.trim).mkString(" ") + val paramTypeComment = SqlParamTypeCommentNode(name, tipe) + positionsWrapper.setPosition(ctx, paramTypeComment) + + // check for duplication + params.get(name) match { + case Some(value) => + val existsParamType = value.nodes.exists { + case _: SqlParamTypeCommentNode => true + case _ => false + } + if (existsParamType) addError(s"Duplicate parameter type definition for $name", context) + else params.update(name, value.copy(tipe = Some(tipe), nodes = value.nodes :+ paramTypeComment)) + case None => + params += (name -> SqlParam(name, None, Some(tipe), None, Vector(paramTypeComment), Vector.empty)) + } + + paramTypeComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleline_default_comment(ctx: PsqlParser.Singleline_default_commentContext): SqlBaseNode = { + Option( + ctx + ) + .map(context => { + if (context.SL_WORD(0) == null) { + addError("Missing name for syntax @default ", context) + SqlErrorNode() + } else if (context.SL_WORD.size() <= 1) { + addError("Missing default value for syntax @default ", context) + SqlErrorNode() + } else { + val name = context.SL_WORD(0).getText.trim + val defaultValue = context.SL_WORD.asScala.tail.map(_.getText.trim).mkString(" ") + val paramDefaultComment = SqlParamDefaultCommentNode(name, defaultValue) + positionsWrapper.setPosition(ctx, paramDefaultComment) + + // check for duplication + params.get(name) match { + case Some(value) => + val existsParamDefault = value.nodes.exists { + case _: SqlParamDefaultCommentNode => true + case _ => false + } + if (existsParamDefault) addError(s"Duplicate parameter default definition for $name", context) + else params + .update(name, value.copy(default = Some(defaultValue), nodes = value.nodes :+ paramDefaultComment)) + case None => params += (name -> SqlParam( + name, + None, + None, + Some(defaultValue), + Vector(paramDefaultComment), + Vector.empty + )) + } + + paramDefaultComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleline_return_comment(ctx: PsqlParser.Singleline_return_commentContext): SqlBaseNode = { + Option( + ctx + ) + .map(context => { + if (context.SL_WORD(0) == null) { + addError("Missing description for syntax @return ", context) + SqlErrorNode() + } else { + val nextLinesComments = " " + Option( + context + .singleline_normal_comment_value() + .asScala + .map(snc => snc.SL_WORD().asScala.map(w => w.getText).mkString(" ")) + .toVector + .mkString(" ") + ).getOrElse("") + val description = (context.SL_WORD().asScala.map(_.getText).mkString(" ") + nextLinesComments).trim + val paramReturnsComment = SqlParamReturnsCommentNode(description) + positionsWrapper.setPosition(ctx, paramReturnsComment) + + returnDescription match { + case Some(_) => addError("Duplicate return description", context) + case None => returnDescription = Some(description) + } + + paramReturnsComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitSingleline_normal_comment_value( + ctx: PsqlParser.Singleline_normal_comment_valueContext + ): SqlBaseNode = { + Option( + ctx + ) + .map(context => { + val value = context.getText + val normalComment = SqlNormalCommentNode(value) + positionsWrapper.setPosition(ctx, normalComment) + normalComment + }) + .getOrElse(SqlErrorNode()) + } + + override def visitMultiline_comment(ctx: PsqlParser.Multiline_commentContext): SqlBaseNode = { + Option(ctx) + .map { context => + val multilineComments = Option(context.multiline_value_comment()) + .map(m => + m.asScala.map(md => + Option(md) + .flatMap(mdContext => Option(visit(mdContext))) + .getOrElse(SqlErrorNode()) + .asInstanceOf[SqlBaseNode] + ) + ) + .getOrElse(Vector.empty) + .toVector + val multiLineComment = SqlMultiLineCommentNode(multilineComments) + positionsWrapper.setPosition(ctx, multiLineComment) + multiLineComment + } + .getOrElse(SqlErrorNode()) + } + + override def visitMultilineParamComment(ctx: PsqlParser.MultilineParamCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.multiline_param_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitMultilineTypeComment(ctx: PsqlParser.MultilineTypeCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.multiline_type_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitMultilineDefaultComment(ctx: PsqlParser.MultilineDefaultCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.multiline_default_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitMultilineReturnComment(ctx: PsqlParser.MultilineReturnCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.multiline_return_comment()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitMultilineUnknownTypeComment(ctx: PsqlParser.MultilineUnknownTypeCommentContext): SqlBaseNode = { + Option(ctx) + .foreach(context => + addError( + "Unknown param annotation the only keywords allowed are @param, @return, @type, @default", + context + ) + ) + SqlErrorNode() + } + + override def visitMultilineNormalComment(ctx: PsqlParser.MultilineNormalCommentContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.multiline_normal_comment_value()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitMultiline_param_comment(ctx: PsqlParser.Multiline_param_commentContext): SqlBaseNode = { + Option(ctx) + .map(context => { + if (context.multiline_word_or_star(0) == null) { + addError("Missing parameter name for syntax @param ", context) + SqlErrorNode() + } else { + val name = context.multiline_word_or_star(0).getText + val description = context.multiline_word_or_star().asScala.drop(1).map(_.getText).mkString(" ") + val paramDefComment = SqlParamDefCommentNode(name, description) + positionsWrapper.setPosition(ctx, paramDefComment) + + // check for duplication + params.get(name) match { + case Some(value) => + val existsParamDef = value.nodes.exists { + case _: SqlParamDefCommentNode => true + case _ => false + } + if (existsParamDef) addError(s"Duplicate parameter definition for $name", context) + else + params.update(name, value.copy(description = Some(description), nodes = value.nodes :+ paramDefComment)) + case None => + params += (name -> SqlParam(name, Some(description), None, None, Vector(paramDefComment), Vector.empty)) + } + + paramDefComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitMultiline_type_comment(ctx: PsqlParser.Multiline_type_commentContext): SqlBaseNode = { + Option(ctx) + .map(context => { + if (context.multiline_word_or_star(0) == null) { + addError("Missing name for syntax @type ", context) + SqlErrorNode() + } else if (context.multiline_word_or_star.size() <= 1) { + addError("Missing type name for syntax @type ", context) + SqlErrorNode() + } else { + val name = context.multiline_word_or_star(0).getText.trim + val tipe = context.multiline_word_or_star.asScala.tail.map(_.getText.trim).mkString(" ") + val paramTypeComment = SqlParamTypeCommentNode(name, tipe) + positionsWrapper.setPosition(ctx, paramTypeComment) + + // check for duplication + params.get(name) match { + case Some(value) => + val existsParamType = value.nodes.exists { + case _: SqlParamTypeCommentNode => true + case _ => false + } + if (existsParamType) addError(s"Duplicate parameter type definition for $name", context) + else params.update(name, value.copy(tipe = Some(tipe), nodes = value.nodes :+ paramTypeComment)) + case None => + params += (name -> SqlParam(name, None, Some(tipe), None, Vector(paramTypeComment), Vector.empty)) + } + + paramTypeComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitMultiline_default_comment(ctx: PsqlParser.Multiline_default_commentContext): SqlBaseNode = { + Option( + ctx + ) + .map(context => { + if (context.multiline_word_or_star(0) == null) { + addError("Missing name for syntax @default ", context) + SqlErrorNode() + } else if (context.multiline_word_or_star.size() <= 1) { + addError("Missing default value for syntax @default ", context) + SqlErrorNode() + } else { + val name = context.multiline_word_or_star(0).getText + val defaultValue = context.multiline_word_or_star.asScala.tail.map(_.getText.trim).mkString(" ") + val paramDefaultComment = SqlParamDefaultCommentNode(name, defaultValue) + positionsWrapper.setPosition(ctx, paramDefaultComment) + + // check for duplication + params.get(name) match { + case Some(value) => + val existsParamDefault = value.nodes.exists { + case _: SqlParamDefaultCommentNode => true + case _ => false + } + if (existsParamDefault) addError(s"Duplicate parameter default definition for $name", context) + else params + .update(name, value.copy(default = Some(defaultValue), nodes = value.nodes :+ paramDefaultComment)) + case None => params += (name -> SqlParam( + name, + None, + None, + Some(defaultValue), + Vector(paramDefaultComment), + Vector.empty + )) + } + + paramDefaultComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitMultiline_return_comment(ctx: PsqlParser.Multiline_return_commentContext): SqlBaseNode = { + Option( + ctx + ) + .map(context => { + if (context.multiline_word_or_star(0) == null) { + addError("Missing description for syntax @return ", context) + SqlErrorNode() + } else { + val description = context.multiline_word_or_star().asScala.map(_.getText).mkString(" ") + val paramReturnsComment = SqlParamReturnsCommentNode(description) + positionsWrapper.setPosition(ctx, paramReturnsComment) + + returnDescription match { + case Some(_) => addError("Duplicate return description", context) + case None => returnDescription = Some(description) + } + + paramReturnsComment + } + }) + .getOrElse(SqlErrorNode()) + } + + override def visitMultiline_normal_comment_value( + ctx: PsqlParser.Multiline_normal_comment_valueContext + ): SqlBaseNode = { + Option( + ctx + ) + .map(context => { + val value = context.getText + val normalComment = SqlNormalCommentNode(value) + positionsWrapper.setPosition(ctx, normalComment) + normalComment + }) + .getOrElse(SqlErrorNode()) + } + + override def visitStmtItems(ctx: PsqlParser.StmtItemsContext): SqlBaseNode = { + Option(ctx) + .map { context => + val statements = Option(context.stmt_items()) + .map(s => + s.asScala.map(st => + Option(st) + .flatMap(mdContext => Option(visit(mdContext))) + .getOrElse(SqlErrorNode()) + .asInstanceOf[SqlBaseNode] + ) + ) + .getOrElse(Vector.empty) + .toVector + val last = ctx.stmt_items().getLast.getStop + val first = ctx.getStart + val stmt = SqlStatementNode(statements) + positionsWrapper.setPosition(first, last, stmt) + stmt + } + .getOrElse(SqlErrorNode()) + } + + override def visitParenStmt(ctx: PsqlParser.ParenStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.stmt()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitParenStmtSqureBr(ctx: PsqlParser.ParenStmtSqureBrContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.stmt()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitNestedStmtSqureBr(ctx: PsqlParser.NestedStmtSqureBrContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.stmt()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitFunCallStmt(ctx: PsqlParser.FunCallStmtContext): SqlBaseNode = { + Option(ctx) + .map { context => + val name = Option(context.idnt()) + .map(i => i.getText) + .getOrElse(context.reserved_keyword().getText) + val arguments = Option(context.stmt_items()) + .map(visit) + val funCall = SqlFunctionCall(name, arguments) + positionsWrapper.setPosition(ctx, funCall) + funCall + } + .getOrElse(SqlErrorNode()) + } + + override def visitUnknownStmt(ctx: PsqlParser.UnknownStmtContext): SqlBaseNode = { + Option(ctx) + .map { context => + val unknown = SqlUnknownNode(context.getText) + positionsWrapper.setPosition(ctx, unknown) + unknown + } + .getOrElse(SqlErrorNode()) + } + + override def visitCommaSeparated(ctx: PsqlParser.CommaSeparatedContext): SqlBaseNode = { + Option(ctx) + .map { context => + val statements = Option(context.stmt_items()) + .map(s => + s.asScala.map(st => + Option(st) + .flatMap(mdContext => Option(visit(mdContext))) + .getOrElse(SqlErrorNode()) + .asInstanceOf[SqlBaseNode] + ) + ) + .getOrElse(Vector.empty) + .toVector + val withComaSeparator = SqlWithComaSeparatorNode(statements) + positionsWrapper.setPosition(ctx, withComaSeparator) + withComaSeparator + } + .getOrElse(SqlErrorNode()) + } + + override def visitTypeCast(ctx: PsqlParser.TypeCastContext): SqlBaseNode = { + Option(ctx) + .flatMap { context => + Option(context.stmt_items()).map { items => + val stmt = Option(items.get(0)).map(visit).getOrElse(SqlErrorNode()) + val tipe = Option(items.get(1)).map(visit).getOrElse(SqlErrorNode()) + val typeCast = SqlTypeCastNode(stmt, tipe) + positionsWrapper.setPosition(ctx, typeCast) + typeCast + } + } + .getOrElse(SqlErrorNode()) + } + + override def visitNestedStmt(ctx: PsqlParser.NestedStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.stmt()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + // override def visitParenStmtItems(ctx: PsqlParser.ParenStmtItemsContext): SqBaseNode = Option(ctx) +// .flatMap(context => Option(context.stmt_items()).map(visit)) +// .getOrElse(SqlErrorNode()) + + override def visitProjStmt(ctx: PsqlParser.ProjStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.proj()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitLiteralStmt(ctx: PsqlParser.LiteralStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.literal()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitKeywordStmt(ctx: PsqlParser.KeywordStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.reserved_keyword()).map(visit)) + .getOrElse(SqlErrorNode()) + } + +// override def visitBinaryExpStmt(ctx: PsqlParser.BinaryExpStmtContext): SqBaseNode = Option(ctx) +// .flatMap(context => Option(context.binary_exp()).map(visit)) +// .getOrElse(SqlErrorNode()) + + override def visitIdntStmt(ctx: PsqlParser.IdntStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.idnt()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitParamStmt(ctx: PsqlParser.ParamStmtContext): SqlBaseNode = { + Option(ctx) + .map(context => { + val name = context.getText.replace(":", "") + val param = SqlParamUseNode(name) + + param match { + case use: SqlParamUseNode => params.get(use.name) match { + case Some(value) => params.update(use.name, value.copy(occurrences = value.occurrences :+ use)) + case None => params += (use.name -> SqlParam(use.name, None, None, None, Vector.empty, Vector(use))) + } + case _ => + } + positionsWrapper.setPosition(ctx, param) + param + }) + .getOrElse(SqlErrorNode()) + } + +// override def visitKeyword(ctx: PsqlParser.KeywordContext): SqlBaseNode = Option(ctx) +// .map { context => +// val keyword = SqlKeywordNode(context.getText) +// positionsWrapper.setPosition(ctx, keyword) +// keyword +// } +// .getOrElse(SqlErrorNode()) + + override def visitReserved_keyword(ctx: PsqlParser.Reserved_keywordContext): SqlBaseNode = { + Option(ctx) + .map { context => + val keyword = SqlKeywordNode(context.getText) + positionsWrapper.setPosition(ctx, keyword) + keyword + } + .getOrElse(SqlErrorNode()) + } + + override def visitOperator(ctx: PsqlParser.OperatorContext): SqlBaseNode = { + Option(ctx) + .map { context => + val operator = SqlOperatorNode(context.getText) + positionsWrapper.setPosition(ctx, operator) + operator + } + .getOrElse(SqlErrorNode()) + } + + override def visitOperatorStmt(ctx: PsqlParser.OperatorStmtContext): SqlBaseNode = { + Option(ctx) + .flatMap(context => Option(context.operator()).map(visit)) + .getOrElse(SqlErrorNode()) + } + + override def visitProperProj(ctx: PsqlParser.ProperProjContext): SqlBaseNode = { + Option(ctx) + .map { context => + val identifiers = Option(context.idnt()) + .map(i => + i.asScala.map(idn => + Option(idn) + .flatMap(mdContext => Option(visit(mdContext))) + .getOrElse(SqlErrorNode()) + .asInstanceOf[SqlBaseNode] + ) + ) + .getOrElse(Vector.empty) + .toVector + val proj = SqlProjNode(identifiers) + positionsWrapper.setPosition(ctx, proj) + proj + } + .getOrElse(SqlErrorNode()) + } + + override def visitMissingIdenProj(ctx: PsqlParser.MissingIdenProjContext): SqlBaseNode = { + Option(ctx) + .map { context => + val identifier = Option(context.idnt()) + .map(visit) + .getOrElse(SqlErrorNode()) + val proj = SqlProjNode(Vector(identifier)) + positionsWrapper.setPosition(ctx, proj) + proj + } + .getOrElse(SqlErrorNode()) + } + + override def visitIdnt(ctx: PsqlParser.IdntContext): SqlBaseNode = { + Option(ctx) + .map { context => + val isDoubleQuoted = context.STRING_IDENTIFIER_START() != null + val value = + if (isDoubleQuoted) { + val text = context.getText + val withoutLast = + if (!text.endsWith("\"")) { + addError("Missing closing \"", context) + text + } else text.dropRight(1) + withoutLast.drop(1) + } else context.getText + val idnt = SqlIdentifierNode(value, isDoubleQuoted) + positionsWrapper.setPosition(ctx, idnt) + idnt + } + .getOrElse(SqlErrorNode()) + } + + override def visitStringLiteral(ctx: PsqlParser.StringLiteralContext): SqlBaseNode = { + Option(ctx) + .map { context => + val value = context.getText + val stringLiteral = SqlStringLiteralNode(value) + positionsWrapper.setPosition(ctx, stringLiteral) + stringLiteral + } + .getOrElse(SqlErrorNode()) + } + + override def visitIntegerLiteral(ctx: PsqlParser.IntegerLiteralContext): SqlBaseNode = { + Option(ctx) + .map { context => + val value = context.getText + val intLiteral = SqlIntLiteralNode(value) + positionsWrapper.setPosition(ctx, intLiteral) + intLiteral + } + .getOrElse(SqlErrorNode()) + } + + override def visitFloatingPointLiteral(ctx: PsqlParser.FloatingPointLiteralContext): SqlBaseNode = { + Option(ctx) + .map { context => + val value = context.getText + val floatingPointLiteral = SqlFloatingPointLiteralNode(value) + positionsWrapper.setPosition(ctx, floatingPointLiteral) + floatingPointLiteral + } + .getOrElse(SqlErrorNode()) + } + + override def visitBooleanLiteral(ctx: PsqlParser.BooleanLiteralContext): SqlBaseNode = { + Option(ctx) + .map { context => + val value = context.getText + val booleanLiteral = SqlBooleanLiteralNode(value) + positionsWrapper.setPosition(ctx, booleanLiteral) + booleanLiteral + } + .getOrElse(SqlErrorNode()) + } + + override def visitTipe(ctx: PsqlParser.TipeContext): SqlBaseNode = { + Option(ctx) + .map { context => + val tipe = SqlTypeNode(context.getText) + positionsWrapper.setPosition(ctx, tipe) + tipe + } + .getOrElse(SqlErrorNode()) + } + + override def visitCommentStmt(ctx: PsqlParser.CommentStmtContext): SqlBaseNode = { + super.visitCommentStmt(ctx) + } + + override def visitTypeStmt(ctx: PsqlParser.TypeStmtContext): SqlBaseNode = { + super.visitTypeStmt(ctx) + } + + // ignored + override def visitPsql_type(ctx: PsqlParser.Psql_typeContext): SqlBaseNode = { + throw new AssertionError(assertionMessage) + } + + override def visitSingleline_unknown_type_comment( + ctx: PsqlParser.Singleline_unknown_type_commentContext + ): SqlBaseNode = { + throw new AssertionError(assertionMessage) + } + + override def visitMultiline_unknown_type_comment( + ctx: PsqlParser.Multiline_unknown_type_commentContext + ): SqlBaseNode = { + throw new AssertionError(assertionMessage) + } + + override def visitNon_reserved_keyword(ctx: PsqlParser.Non_reserved_keywordContext): SqlBaseNode = { + throw new AssertionError(assertionMessage) + } + + override def visitMultiline_word_or_star(ctx: PsqlParser.Multiline_word_or_starContext): SqlBaseNode = { + throw new AssertionError(assertionMessage) + } +} diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitorParseErrors.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitorParseErrors.scala similarity index 66% rename from sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitorParseErrors.scala rename to sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitorParseErrors.scala index 2512d3b9c..6ae3e4e2b 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/RawSqlVisitorParseErrors.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/antlr4/SqlVisitorParseErrors.scala @@ -14,8 +14,14 @@ package com.rawlabs.sql.compiler.antlr4 import com.rawlabs.compiler.Message -case class RawSqlVisitorParseErrors() { - private var errors: List[Message] = List.empty - def addError(error: Message): Unit = errors = errors :+ error - def getErrors: List[Message] = errors +import scala.collection.mutable + +class SqlVisitorParseErrors { + + private val errors = new mutable.ListBuffer[Message] + + def addError(error: Message): Unit = errors.append(error) + + def getErrors: List[Message] = errors.to + } diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala index aeecacbd6..b058b2bc4 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/Completion.scala @@ -17,14 +17,15 @@ import com.typesafe.scalalogging.StrictLogging import java.sql.{Connection, PreparedStatement} -/* Runs a completion query, taking care of running the statement, closing it, passing the resultSet to a custom +/** + * Runs a completion query, taking care of running the statement, closing it, passing the resultSet to a custom * `process` method that returns a list of identifiers. It's abstract and customized by the couple flavors we need - * for dot/word completion */ + * for dot/word completion. + * + * @param q the query to complete + */ abstract class Completion(q: String) extends StrictLogging { - protected def needsQuotes(s: String): Boolean = s.exists(c => !c.isLetterOrDigit && c != '_' || c.isUpper) - protected def setParams(preparedStatement: PreparedStatement, items: Seq[String]): Unit - def run( con: Connection, items: Seq[String] @@ -53,4 +54,8 @@ abstract class Completion(q: String) extends StrictLogging { } } + protected def needsQuotes(s: String): Boolean = s.exists(c => !c.isLetterOrDigit && c != '_' || c.isUpper) + + protected def setParams(preparedStatement: PreparedStatement, items: Seq[String]): Unit + } diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala index 7a7460d12..1eb40dc6b 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/metadata/UserMetadataCache.scala @@ -22,13 +22,19 @@ import java.sql.SQLException case class IdentifierInfo(name: Seq[SqlIdentifier], tipe: String) -/* This class is used to cache metadata info about the user's database. +/** + * This class is used to cache metadata info about the user's database. * It is used to provide completion for the SQL editor. Each user has its own instance. * The cache contains two completion caches: * - word completion: when the user types a word, it is used to find tables, columns, that match the beginning of a word. * - dot completion: when the user types a dot, it is used to find columns or tables that match the prefix items. * Entries in these two caches are fairly short-lived. They get deleted (and recomputed if needed) after a few seconds - * so that the user can see new schemas, tables or columns that have been created in the database. + * *o that the user can see new schemas, tables or columns that have been created in the database. + * + * @param jdbcUrl the JDBC URL to connect to the database + * @param connectionPool the connection pool to use to connect to the database + * @param maxSize the maximum size of the cache + * @param expiry the duration after which an entry is deleted from the cache */ class UserMetadataCache(jdbcUrl: String, connectionPool: SqlConnectionPool, maxSize: Int, expiry: Duration) extends StrictLogging { @@ -73,7 +79,7 @@ class UserMetadataCache(jdbcUrl: String, connectionPool: SqlConnectionPool, maxS } else Seq.empty } - // on word completion we get a tokenized sequence of identifiers like [raw, airp] and should find potential + // On word completion we get a tokenized sequence of identifiers like [raw, airp] and should find potential // matches. In order to use the completion cache more often, instead of sending these tokens in a WHERE clause, // we replace the last item (here 'airp') and keep only one letter before issuing the search. This is a trick // that permits to reused the cache soon after, since any following keystroke will likely only append a new letter. @@ -82,7 +88,7 @@ class UserMetadataCache(jdbcUrl: String, connectionPool: SqlConnectionPool, maxS // [raw,airports,cit] => [raw,airports,c] // [air] => [a] // - // when the user keeps typing example.ai, air, airp => we reuse that cached entry. + // When the user keeps typing example.ai, air, airp => we reuse that cached entry. seq.lastOption .map { diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala index e18cb214e..3c3936958 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetCsvWriter.scala @@ -43,6 +43,12 @@ import scala.annotation.tailrec object TypedResultSetCsvWriter { + final private val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") + final private val timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS") + final private val timeFormatterNoMs = DateTimeFormatter.ofPattern("HH:mm:ss") + final private val timestampFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS") + final private val timestampFormatterNoMs = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss") + def outputWriteSupport(tipe: RawType): Boolean = tipe match { case _: RawIterableType => true case _: RawListType => true @@ -53,6 +59,8 @@ object TypedResultSetCsvWriter { class TypedResultSetCsvWriter(os: OutputStream, lineSeparator: String, maxRows: Option[Long]) { + import TypedResultSetCsvWriter._ + final private val gen = try { val factory = new CsvFactory @@ -69,12 +77,6 @@ class TypedResultSetCsvWriter(os: OutputStream, lineSeparator: String, maxRows: schemaBuilder.setQuoteChar('"') schemaBuilder.setNullValue("") - final private val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") - final private val timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS") - final private val timeFormatterNoMs = DateTimeFormatter.ofPattern("HH:mm:ss") - final private val timestampFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS") - final private val timestampFormatterNoMs = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss") - private var maxRowsReached = false def complete: Boolean = !maxRowsReached @@ -135,7 +137,7 @@ class TypedResultSetCsvWriter(os: OutputStream, lineSeparator: String, maxRows: else { gen.writeString(data) } - case t => throw new IOException(s"unsupported type $t") + case _ => throw new IOException(s"unsupported type") } case _: RawDateType => val date = v.getDate(i).toLocalDate diff --git a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala index 080d0dc07..ef50ed6fa 100644 --- a/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala +++ b/sql-compiler/src/main/scala/com/rawlabs/sql/compiler/writers/TypedResultSetJsonWriter.scala @@ -34,7 +34,7 @@ import com.rawlabs.compiler.{ RawTimestampType, RawType } -import com.rawlabs.sql.compiler.SqlIntervals.{intervalToString, parseInterval} +import com.rawlabs.sql.compiler.SqlIntervals.{intervalToString, stringToInterval} import com.rawlabs.compiler.utils.RecordFieldsNaming import java.io.{IOException, OutputStream} @@ -44,6 +44,10 @@ import scala.annotation.tailrec object TypedResultSetJsonWriter { + final private val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") + final private val timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS") + final private val timestampFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS") + def outputWriteSupport(tipe: RawType): Boolean = tipe match { case _: RawIterableType => true case _: RawListType => true @@ -54,6 +58,8 @@ object TypedResultSetJsonWriter { class TypedResultSetJsonWriter(os: OutputStream, maxRows: Option[Long]) { + import TypedResultSetJsonWriter._ + final private val gen = try { val factory = new JsonFactory @@ -63,10 +69,7 @@ class TypedResultSetJsonWriter(os: OutputStream, maxRows: Option[Long]) { case e: IOException => throw new RuntimeException(e) } - final private val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") - final private val timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS") - final private val timestampFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS") - final private val mapper = new ObjectMapper(); + final private val mapper = new ObjectMapper() private var maxRowsReached = false @@ -125,7 +128,7 @@ class TypedResultSetJsonWriter(os: OutputStream, maxRows: Option[Long]) { val json = mapper.readTree(data) writeRawJson(json) } - case t => throw new IOException(s"unsupported type $t") + case _ => throw new IOException("unsupported type") } case _: RawDateType => val date = v.getDate(i).toLocalDate @@ -139,7 +142,7 @@ class TypedResultSetJsonWriter(os: OutputStream, maxRows: Option[Long]) { val formatted = timestampFormatter.format(dateTime) gen.writeString(formatted) case _: RawIntervalType => - val interval = parseInterval(v.getString(i)) + val interval = stringToInterval(v.getString(i)) gen.writeString(intervalToString(interval)) case _ => throw new IOException("unsupported type") } diff --git a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala index bae7ed934..430600fd2 100644 --- a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestNamedParametersStatement.scala @@ -14,7 +14,7 @@ package com.rawlabs.sql.compiler import com.dimafeng.testcontainers.{ForAllTestContainer, PostgreSQLContainer} import com.rawlabs.compiler.{RawInt, RawString} -import com.rawlabs.sql.compiler.antlr4.RawSqlSyntaxAnalyzer +import com.rawlabs.sql.compiler.antlr4.SqlSyntaxAnalyzer import org.bitbucket.inkytonik.kiama.util.Positions import org.testcontainers.utility.DockerImageName import com.rawlabs.utils.core._ @@ -40,7 +40,7 @@ class TestNamedParametersStatement val dbName = container.databaseName val user = container.username val password = container.password - connectionPool = new SqlConnectionPool() + connectionPool = new SqlConnectionPool jdbcUrl = s"jdbc:postgresql://localhost:$dbPort/$dbName?user=$user&password=$password" } @@ -178,7 +178,7 @@ class TestNamedParametersStatement private def parse(sourceCode: String) = { val positions = new Positions - val syntaxAnalyzer = new RawSqlSyntaxAnalyzer(positions) + val syntaxAnalyzer = new SqlSyntaxAnalyzer(positions) syntaxAnalyzer.parse(sourceCode) } diff --git a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala index 278c6ac79..2a0afb51a 100644 --- a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestParseIntervals.scala @@ -13,7 +13,7 @@ package com.rawlabs.sql.compiler import com.rawlabs.compiler.RawInterval -import com.rawlabs.sql.compiler.SqlIntervals.parseInterval +import com.rawlabs.sql.compiler.SqlIntervals.stringToInterval import org.scalatest.funsuite.AnyFunSuite class TestParseIntervals extends AnyFunSuite { @@ -36,20 +36,20 @@ class TestParseIntervals extends AnyFunSuite { "00:00:00.002" -> RawInterval(0, 0, 0, 0, 0, 0, 0, 2) ).foreach { case (k, v) => - val interval = parseInterval(k) + val interval = stringToInterval(k) assert(interval == v) } } test("parse multiple items") { - val interval = parseInterval("1 year 2 mons 3 days 04:05:06.007") + val interval = stringToInterval("1 year 2 mons 3 days 04:05:06.007") assert(interval == RawInterval(1, 2, 0, 3, 4, 5, 6, 7)) } test("parse milliseconds") { - var interval = parseInterval("00:00:00.01") + var interval = stringToInterval("00:00:00.01") assert(interval == RawInterval(0, 0, 0, 0, 0, 0, 0, 10)) - interval = parseInterval("00:00:00.1234567") + interval = stringToInterval("00:00:00.1234567") assert(interval == RawInterval(0, 0, 0, 0, 0, 0, 0, 123)) } } diff --git a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala index 34395e225..7b82bd54e 100644 --- a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlConnectionFailures.scala @@ -40,20 +40,19 @@ import java.sql.DriverManager import java.util.concurrent.{Executors, TimeUnit} import scala.io.Source +// The test suite triggers connection failures for both 'no connections +// available' (the pool can't open a new connection) and 'too many +// connections active' (the user runs too many queries in parallel) +// for all implemented calls: execute, validate, getProgramDescription, +// hover, dotCompletion, wordCompletion. For each we use sequential +// or parallel queries to exhaust the pool in some way and assert the +// failure is hit as expected. class TestSqlConnectionFailures extends RawTestSuite with ForAllTestContainer with SettingsTestContext with TrainingWheelsContext { - // The test suite triggers connection failures for both 'no connections - // available' (the pool can't open a new connection) and 'too many - // connections active' (the user runs too many queries in parallel) - // for all implemented calls: execute, validate, getProgramDescription, - // hover, dotCompletion, wordCompletion. For each we use sequential - // or parallel queries to exhaust the pool in some way and assert the - // failure is hit as expected. - // Number of users to run with. This allows testing errors that occur // when a single user exhausts their allocated share. val nUsers = 3 @@ -254,10 +253,9 @@ class TestSqlConnectionFailures } test("[execute] enough connections in total") { _ => - /* Each user runs three times the same long query, one call at a time. The same connection is reused per user. - * This is confirmed by setting max-connections-per-db to 1 although several calls are performed per DB. - * In total, there's one connection per user. Setting max-connections to nUsers is working. - */ + // Each user runs three times the same long query, one call at a time. The same connection is reused per user. + // This is confirmed by setting max-connections-per-db to 1 although several calls are performed per DB. + // In total, there's one connection per user. Setting max-connections to nUsers is working. val nCalls = 2 property("raw.sql.compiler.pool.max-connections", s"$nUsers") property("raw.sql.compiler.pool.max-connections-per-db", s"1") @@ -304,10 +302,9 @@ class TestSqlConnectionFailures } test("[execute] not enough connections") { _ => - /* Each user runs twice execute, one call at a time. The same connection can be reused per user. - * In total, there's one connection per user. Setting max-connections to nUsers - 1 triggers the - * expected failure. The number of errors hit should be positive (checked in the end) - */ + // Each user runs twice execute, one call at a time. The same connection can be reused per user. + // In total, there's one connection per user. Setting max-connections to nUsers - 1 triggers the + // expected failure. The number of errors hit should be positive (checked in the end) val nCalls = 2 property("raw.sql.compiler.pool.max-connections", s"${nUsers - 1}") property("raw.sql.compiler.pool.max-connections-per-db", s"1") @@ -330,10 +327,9 @@ class TestSqlConnectionFailures } test("[getProgramDescription] not enough connections") { _ => - /* Each user runs twice getProgramDescription, one call at a time. The same connection can be reused per user. - * In total, there's one connection per user. Setting max-connections to nUsers - 1 triggers the - * expected failure. The number of errors hit should be positive (checked in the end) - */ + // Each user runs twice getProgramDescription, one call at a time. The same connection can be reused per user. + // In total, there's one connection per user. Setting max-connections to nUsers - 1 triggers the + // expected failure. The number of errors hit should be positive (checked in the end) val nCalls = 2 property("raw.sql.compiler.pool.max-connections", s"${nUsers - 1}") property("raw.sql.compiler.pool.max-connections-per-db", s"1") @@ -357,10 +353,9 @@ class TestSqlConnectionFailures } test("[validate] not enough connections") { _ => - /* Each user runs twice validate, one call at a time. The same connection can be reused per user. - * In total, there's one connection per user. Setting max-connections to nUsers - 1 triggers the - * expected failure. The number of errors hit should be positive (checked in the end) - */ + // Each user runs twice validate, one call at a time. The same connection can be reused per user. + // In total, there's one connection per user. Setting max-connections to nUsers - 1 triggers the + // expected failure. The number of errors hit should be positive (checked in the end) val nCalls = 2 property("raw.sql.compiler.pool.max-connections", s"${nUsers - 1}") property("raw.sql.compiler.pool.max-connections-per-db", s"1") diff --git a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala index 5b1abdb14..2ce018ac2 100644 --- a/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala +++ b/sql-compiler/src/test/scala/com/rawlabs/sql/compiler/TestSqlParser.scala @@ -14,7 +14,6 @@ package com.rawlabs.sql.compiler import com.rawlabs.sql.compiler.antlr4.{ ParseProgramResult, - RawSqlSyntaxAnalyzer, SqlFunctionCall, SqlIdentifierNode, SqlKeywordNode, @@ -22,6 +21,7 @@ import com.rawlabs.sql.compiler.antlr4.{ SqlProjNode, SqlStatementNode, SqlStringLiteralNode, + SqlSyntaxAnalyzer, SqlWithComaSeparatorNode } import org.bitbucket.inkytonik.kiama.util.Positions @@ -31,7 +31,7 @@ class TestSqlParser extends AnyFunSuite { private def doTest(code: String): ParseProgramResult = { val positions = new Positions - val parser = new RawSqlSyntaxAnalyzer(positions) + val parser = new SqlSyntaxAnalyzer(positions) parser.parse(code) } @@ -41,21 +41,17 @@ class TestSqlParser extends AnyFunSuite { assert(result.isSuccess) assert(result.params.isEmpty) assert(result.returnDescription.isEmpty) - result.tree match { - case SqlProgramNode(statement) => statement match { - case SqlStatementNode(statementItems) => - assert(statementItems.size == 4) - assert(statementItems(0).isInstanceOf[SqlKeywordNode]) - assert(statementItems(1).isInstanceOf[SqlKeywordNode]) - assert(statementItems(2).isInstanceOf[SqlKeywordNode]) - assert(statementItems(3).isInstanceOf[SqlIdentifierNode]) - val identifier = statementItems(3).asInstanceOf[SqlIdentifierNode] - assert( - identifier.name == "table" - ) - } - - } + val SqlProgramNode(statement) = result.tree + val SqlStatementNode(statementItems) = statement + assert(statementItems.size == 4) + assert(statementItems(0).isInstanceOf[SqlKeywordNode]) + assert(statementItems(1).isInstanceOf[SqlKeywordNode]) + assert(statementItems(2).isInstanceOf[SqlKeywordNode]) + assert(statementItems(3).isInstanceOf[SqlIdentifierNode]) + val identifier = statementItems(3).asInstanceOf[SqlIdentifierNode] + assert( + identifier.name == "table" + ) } test("Test with all parameters values single line comments") { @@ -225,20 +221,15 @@ class TestSqlParser extends AnyFunSuite { val code = """select hello, NOW() from "some"."table"""".stripMargin val result = doTest(code) assert(result.isSuccess) - result.tree match { - case SqlProgramNode(statement) => statement match { - case SqlStatementNode(statementItems) => - assert(statementItems.size == 4) - statementItems(1) match { - case SqlWithComaSeparatorNode(inStatements) => inStatements(1) match { - case SqlFunctionCall(name, arguments) => - assert(name == "NOW") - assert(arguments.isEmpty) - case _ => fail("Expected function call") - } - } - - } + val SqlProgramNode(statement) = result.tree + val SqlStatementNode(statementItems) = statement + assert(statementItems.size == 4) + val SqlWithComaSeparatorNode(inStatements) = statementItems(1) + inStatements(1) match { + case SqlFunctionCall(name, arguments) => + assert(name == "NOW") + assert(arguments.isEmpty) + case _ => fail("Expected function call") } } @@ -420,25 +411,26 @@ class TestSqlParser extends AnyFunSuite { assert( result.errors.head.message == "Missing identifier after '.'" ) - result.tree match { - case SqlProgramNode(statement) => statement match { - case SqlStatementNode(statementItems) => - assert(statementItems.size == 8) - statementItems(5) match { - case SqlProjNode(identifiers) => identifiers(0) match { - case identifier: SqlIdentifierNode => - assert(identifier.name == "ai") - assert(!identifier.isQuoted) - } - } - statementItems(7) match { - case SqlProjNode(identifiers) => identifiers(0) match { - case identifier: SqlIdentifierNode => - assert(identifier.name == "airports") - assert(!identifier.isQuoted) - } - } + val SqlProgramNode(statement) = result.tree + val SqlStatementNode(statementItems) = statement + assert(statementItems.size == 8) + statementItems(5) match { + case SqlProjNode(identifiers) => identifiers(0) match { + case identifier: SqlIdentifierNode => + assert(identifier.name == "ai") + assert(!identifier.isQuoted) + case _ => fail("Expected identifier") } + case _ => fail("Expected projection node") + } + statementItems(7) match { + case SqlProjNode(identifiers) => identifiers(0) match { + case identifier: SqlIdentifierNode => + assert(identifier.name == "airports") + assert(!identifier.isQuoted) + case _ => fail("Expected identifier") + } + case _ => fail("Expected projection node") } } @@ -446,17 +438,12 @@ class TestSqlParser extends AnyFunSuite { val code = "SELECT smth from \"\"\"hello\"" val result = doTest(code) assert(result.isSuccess) - result.tree match { - case SqlProgramNode(statement) => statement match { - case SqlStatementNode(statementItems) => - assert(statementItems.size == 4) - statementItems(3) match { - case identifier: SqlIdentifierNode => - assert(identifier.name == "\"\"hello") - assert(identifier.isQuoted) - } - } - } + val SqlProgramNode(statement) = result.tree + val SqlStatementNode(statementItems) = statement + assert(statementItems.size == 4) + val identifier = statementItems(3).asInstanceOf[SqlIdentifierNode] + assert(identifier.name == "\"\"hello") + assert(identifier.isQuoted) } test("Test unicode parsing properly") { @@ -483,11 +470,9 @@ class TestSqlParser extends AnyFunSuite { val code = """select * from smth; -- a comment""".stripMargin val result = doTest(code) assert(result.isSuccess) - result.tree match { - case SqlProgramNode(statement) => statement match { - case SqlStatementNode(statementItems) => assert(statementItems.size == 4) - } - } + val SqlProgramNode(statement) = result.tree + val SqlStatementNode(statementItems) = statement + assert(statementItems.size == 4) } test("Test multiple statements with comments more advanced") { @@ -496,11 +481,9 @@ class TestSqlParser extends AnyFunSuite { | -- @param hello hello""".stripMargin val result = doTest(code) assert(result.isSuccess) - result.tree match { - case SqlProgramNode(statement) => statement match { - case SqlStatementNode(statementItems) => assert(statementItems.size == 4) - } - } + val SqlProgramNode(statement) = result.tree + val SqlStatementNode(statementItems) = statement + assert(statementItems.size == 4) assert(result.params.isEmpty) } @@ -596,15 +579,11 @@ class TestSqlParser extends AnyFunSuite { |" from anything """.stripMargin val result = doTest(code) val SqlProgramNode(stmt) = result.tree - stmt match { - case SqlStatementNode(statementItems) => - assert(statementItems.size == 4) - statementItems(1) match { - case node: SqlIdentifierNode => - val finish = result.positions.getFinish(node) - assert(finish.get.line == 3) - } - } + val SqlStatementNode(statementItems) = stmt + assert(statementItems.size == 4) + val node = statementItems(1).asInstanceOf[SqlIdentifierNode] + val finish = result.positions.getFinish(node) + assert(finish.get.line == 3) } test("multiline string test") { @@ -613,15 +592,11 @@ class TestSqlParser extends AnyFunSuite { |' from anything """.stripMargin val result = doTest(code) val SqlProgramNode(stmt) = result.tree - stmt match { - case SqlStatementNode(statementItems) => - assert(statementItems.size == 4) - statementItems(1) match { - case node: SqlStringLiteralNode => - val finish = result.positions.getFinish(node) - assert(finish.get.line == 3) - } - } + val SqlStatementNode(statementItems) = stmt + assert(statementItems.size == 4) + val node = statementItems(1).asInstanceOf[SqlStringLiteralNode] + val finish = result.positions.getFinish(node) + assert(finish.get.line == 3) } test("newline after comment") { diff --git a/sql-parser/src/main/java/com/rawlabs/sql/parser/generated/Placeholder.java b/sql-parser/src/main/java/com/rawlabs/sql/parser/generated/Placeholder.java new file mode 100644 index 000000000..f54177441 --- /dev/null +++ b/sql-parser/src/main/java/com/rawlabs/sql/parser/generated/Placeholder.java @@ -0,0 +1,17 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.sql.parser.generated; + +class Placeholder { + // Placeholder class to allow the module-info.java file to be compiled +} diff --git a/utils-core/src/main/resources/reference.conf b/utils-core/src/main/resources/reference.conf index 2ff0cb4db..f70cd01ed 100644 --- a/utils-core/src/main/resources/reference.conf +++ b/utils-core/src/main/resources/reference.conf @@ -1,3 +1,6 @@ raw { + # Generic flag to enable/disable training wheels. + # Training wheels are a set of features that help the user to understand the system. + # They are not meant to be used in production as they can slow down the system significantly. training-wheels = false } diff --git a/utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala b/utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala index 1c733c58c..79451c6c7 100644 --- a/utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala +++ b/utils-core/src/main/scala/com/rawlabs/utils/core/RawVerboseRunnable.scala @@ -22,8 +22,10 @@ import com.typesafe.scalalogging.StrictLogging * the result of the task, either by calling Future.get or by adding an error handling stage when using completable * futures. * - * Inspired by - * https://github.com/jcabi/jcabi-log/blob/master/src/main/java/com/jcabi/log/VerboseRunnable.java + * Inspired by: + * https://github.com/jcabi/jcabi-log/blob/master/src/main/java/com/jcabi/log/VerboseRunnable.java + * + * @param delegate The runnable to wrap. * @param propagate Whether to rethrow the exception. */ class RawVerboseRunnable(delegate: Runnable, propagate: Boolean = false) extends Runnable with StrictLogging { diff --git a/utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala index 0c9373ec6..3b388b9f4 100644 --- a/utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/RawMultiplyingTestSuite.scala @@ -17,52 +17,21 @@ import org.scalatest.{Args, CompositeStatus, Status} trait RawMultiplyingTestSuite extends RawTestSuite { this: SettingsTestContext => - protected case class RawData(name: String, rawCode: String) - - private var formatsToUse = Seq.empty[String] private var settingsToUse = Seq.empty[Map[String, Any]] protected var currentFormat: String = _ - private val supportedFormats = Seq( - "hjson", - "hjson/!infer", - "hjson/sparksql", - "csv", - "parquet", - "json", - "inline" - ) - def multiplyingSettings(settings: Seq[Map[String, String]]): Unit = { settingsToUse = settings } - def multiplyingSourceFormats(formats: String*): Unit = { - for (f <- formats) assert(supportedFormats.contains(f)) - formatsToUse = formats - } - override def run(testName: Option[String], args: Args): Status = { - if (formatsToUse.isEmpty && settingsToUse.isEmpty) { + if (settingsToUse.isEmpty) { // Run tests normally. super.run(testName, args) - } else if (formatsToUse.isEmpty) { - assert(testName.isEmpty) - val statuses = for (s <- settingsToUse) yield { - val originalProperties = properties.clone() - try { - s.foreach { case (k, v) => properties.put(k, v) } - super.run(testName, args) - } finally { - properties = originalProperties - } - } - new CompositeStatus(statuses.to) } else { assert(testName.isEmpty) - val statuses = for (f <- formatsToUse; s <- settingsToUse) yield { - currentFormat = f + val statuses = for (s <- settingsToUse) yield { val originalProperties = properties.clone() try { s.foreach { case (k, v) => properties.put(k, v) } diff --git a/utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala index 9050017f4..86021946d 100644 --- a/utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/RawTestSuite.scala @@ -34,7 +34,6 @@ object RawTestSuite extends StrictLogging { } } -// TODO (msb): Replace all uses of FunSuite in our source code by RawTest. trait RawTestSuite extends FixtureAnyFunSuite with BeforeAndAfterAll with StrictLogging { RawTestSuite.printJvmInfo() @@ -51,6 +50,8 @@ trait RawTestSuite extends FixtureAnyFunSuite with BeforeAndAfterAll with Strict } override def afterAll(): Unit = { + // Always ensure that all services have been stopped correctly. + // If not, this means the code under test is not cleaning up properly. logger.info("Checking if all services have stopped") var attempts = 10 while (!RawService.isStopped() && attempts > 0) { diff --git a/utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala index a905846c7..f083d2911 100644 --- a/utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/SettingsTestContext.scala @@ -18,7 +18,7 @@ import scala.collection.JavaConverters._ import scala.collection.mutable trait SettingsTestContext { - protected var properties = mutable.Map[String, Any]() + protected var properties: mutable.Map[String, Any] = mutable.Map[String, Any]() implicit def settings: RawSettings = new RawSettings( ConfigFactory.load(), diff --git a/utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala b/utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala index a352c1fde..af0297538 100644 --- a/utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala +++ b/utils-core/src/test/scala/com/rawlabs/utils/core/TrainingWheelsContext.scala @@ -16,5 +16,4 @@ trait TrainingWheelsContext { this: RawTestSuite with SettingsTestContext => property("raw.training-wheels", "true") - property("raw.snapi.frontend.check-syntax-analyzers", "false") } From 9f89f063935915eb1fdc30027fdbd6aeea205e3d Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Fri, 23 Aug 2024 14:47:14 +0200 Subject: [PATCH 4/7] Minor fixes to compiler protocol (#493) - Protocol fixes - Adding copyright - Removing old jackson annotations --- .../compiler/CompilerServiceProvider.scala | 4 +- .../scala/com/rawlabs/compiler/Errors.scala | 41 +--- .../protocol/compiler/completions.proto | 73 +++++++ .../com/rawlabs/protocol/compiler/docs.proto | 5 - .../protocol/compiler/location_config.proto | 184 ++++++++++-------- .../rawlabs/protocol/compiler/messages.proto | 5 +- .../compiler/program_environment.proto | 3 +- 7 files changed, 185 insertions(+), 130 deletions(-) create mode 100644 protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/completions.proto diff --git a/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala b/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala index 1a670e1e2..307776499 100644 --- a/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/CompilerServiceProvider.scala @@ -54,11 +54,11 @@ object CompilerServiceProvider { private def build(language: String)(implicit settings: RawSettings): CompilerService = { val services = ServiceLoader.load(classOf[CompilerServiceBuilder]).asScala.toArray if (services.isEmpty) { - throw new CompilerException("no compiler service available") + throw new AssertionError("no compiler service available") } else { services.find(p => p.language.contains(language)) match { case Some(builder) => builder.build - case None => throw new CompilerException(s"cannot find compiler service: $language") + case None => throw new AssertionError(s"cannot find compiler service: $language") } } } diff --git a/compiler/src/main/scala/com/rawlabs/compiler/Errors.scala b/compiler/src/main/scala/com/rawlabs/compiler/Errors.scala index a78168e37..7363e353f 100644 --- a/compiler/src/main/scala/com/rawlabs/compiler/Errors.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/Errors.scala @@ -12,29 +12,15 @@ package com.rawlabs.compiler -import com.fasterxml.jackson.annotation.{JsonSubTypes, JsonTypeInfo} -import com.fasterxml.jackson.annotation.JsonSubTypes.{Type => JsonType} -import com.rawlabs.utils.core.RawException - /** * Used for errors that are found during semantic analysis. - * message The error message. - * positions The positions where the error occurred. - * severity The severity of the error. 1 = Hint, 2 = Info, 4 = Warning, 8 = Error (compliant with monaco editor). - * - The below two should only be set by compiler errors - * code An optional error code. - * tags Indication for the error Unnecessary = 1, Deprecated = 2 (compliant with monaco editor). + * + * - message: The error message. + * - positions: The positions where the error occurred. + * - severity: The severity of the error. 1 = Hint, 2 = Info, 4 = Warning, 8 = Error (compliant with monaco editor). + * - code: An optional error code (should only be set by compiler errors) + * - tags: Indication for the error Unnecessary = 1, Deprecated = 2 (compliant with monaco editor). */ - -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") -@JsonSubTypes( - Array( - new JsonType(value = classOf[HintMessage], name = "hint"), - new JsonType(value = classOf[InfoMessage], name = "info"), - new JsonType(value = classOf[WarningMessage], name = "warning"), - new JsonType(value = classOf[ErrorMessage], name = "hint") - ) -) sealed trait Message { val message: String val positions: List[ErrorRange] @@ -77,18 +63,3 @@ final case class ErrorMessage( final case class ErrorRange(begin: ErrorPosition, end: ErrorPosition) final case class ErrorPosition(line: Int, column: Int) - -/** - * Used for exceptions that are thrown by the compiler itself. - * Must abort compilation. - * Should NOT BE USED for: - * - semantic analysis errors or other normal errors since there is no tracking of positions. - * - errors during execution. - * Should BE USED for: - * - errors that are not found during type checking but which prevent the compiler from proceeding, e.g. - * missing implementations or the like. - * Parsing may throw this exception if they encounter an error that they cannot recover from. - * - * The message can be safely shared with the user. - */ -sealed class CompilerException(message: String, cause: Throwable = null) extends RawException(message, cause) diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/completions.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/completions.proto new file mode 100644 index 000000000..467ff42c6 --- /dev/null +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/completions.proto @@ -0,0 +1,73 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +syntax = "proto3"; + +option java_package = "com.rawlabs.protocol.compiler"; +option java_multiple_files = true; + +import "com/rawlabs/protocol/compiler/docs.proto"; + +package com.rawlabs.protocol.compiler; + +message Completion { + oneof completion { + TypeCompletion type = 1; + FieldCompletion field = 2; + LetBindCompletion letBind = 3; + LetFunCompletion letFun = 4; + LetFunRecCompletion letFunRec = 5; + FunParamCompletion funParam = 6; + PackageCompletion package = 7; + EntryCompletion entry = 8; + } +} + +message TypeCompletion { + string name = 1; + string type = 2; +} + +message FieldCompletion { + string name = 1; + string type = 2; +} + +message LetBindCompletion { + string name = 1; + string type = 2; +} + +message LetFunCompletion { + string name = 1; + string type = 2; +} + +message LetFunRecCompletion { + string name = 1; + string type = 2; +} + +message FunParamCompletion { + string name = 1; + string type = 2; +} + +message PackageCompletion { + string name = 1; + PackageDoc doc = 2; +} + +message EntryCompletion { + string name = 1; + EntryDoc doc = 2; +} \ No newline at end of file diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto index ed9d852d0..4b64d019b 100644 --- a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/docs.proto @@ -24,11 +24,6 @@ message PackageDoc { optional string danger = 4; } -message EntryCompletion { - string name = 1; - EntryDoc doc = 2; -} - message EntryDoc { string summary = 1; optional string description = 2; diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/location_config.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/location_config.proto index 751a42359..621696d70 100644 --- a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/location_config.proto +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/location_config.proto @@ -1,3 +1,15 @@ +/* + * Copyright 2024 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + syntax = "proto3"; option java_package = "com.rawlabs.protocol.compiler"; @@ -6,148 +18,148 @@ option java_multiple_files = true; package com.rawlabs.protocol.compiler; message LocationConfig { - oneof config { - S3Config s3 = 1; - MySqlConfig mysql = 2; - OracleConfig oracle = 3; - PostgreSQLConfig postgresql = 4; - SQLServerConfig sqlserver = 5; - SnowflakeConfig snowflake = 6; - SqliteConfig sqlite = 7; - TeradataConfig teradata = 8; - GitHubConfig github = 9; - JiraConfig jira = 10; - ConfluenceConfig confluence = 11; - SalesforceConfig salesforce = 12; - DropboxAccessTokenConfig dropboxAccessToken = 13; - DropboxUsernamePasswordConfig dropboxUsernamePassword = 14; - HttpHeadersConfig httpHeaders = 15; - SecretConfig secret = 99; - ErrorConfig error = 9999; - } + oneof config { + S3Config s3 = 1; + MySqlConfig mysql = 2; + OracleConfig oracle = 3; + PostgreSQLConfig postgresql = 4; + SQLServerConfig sqlserver = 5; + SnowflakeConfig snowflake = 6; + SqliteConfig sqlite = 7; + TeradataConfig teradata = 8; + GitHubConfig github = 9; + JiraConfig jira = 10; + ConfluenceConfig confluence = 11; + SalesforceConfig salesforce = 12; + DropboxAccessTokenConfig dropboxAccessToken = 13; + DropboxUsernamePasswordConfig dropboxUsernamePassword = 14; + HttpHeadersConfig httpHeaders = 15; + SecretConfig secret = 99; + ErrorConfig error = 9999; + } } message S3Config { - optional S3AccessSecretKey accessSecretKey = 1; - optional string region = 2; + optional S3AccessSecretKey accessSecretKey = 1; + optional string region = 2; } message S3AccessSecretKey { - string accessKey = 1; - string secretKey = 2; + string accessKey = 1; + string secretKey = 2; } message MySqlConfig { - string host = 1; - int32 port = 2; - string database = 3; - string user = 4; - string password = 5; + string host = 1; + int32 port = 2; + string database = 3; + string user = 4; + string password = 5; } message OracleConfig { - string host = 1; - int32 port = 2; - string database = 3; - string user = 4; - string password = 5; - optional string schema = 6; + string host = 1; + int32 port = 2; + string database = 3; + string user = 4; + string password = 5; + optional string schema = 6; } message PostgreSQLConfig { - string host = 1; - int32 port = 2; - string database = 3; - string user = 4; - string password = 5; - optional string schema = 6; + string host = 1; + int32 port = 2; + string database = 3; + string user = 4; + string password = 5; + optional string schema = 6; } message SQLServerConfig { - string host = 1; - int32 port = 2; - string database = 3; - string user = 4; - string password = 5; - optional string schema = 6; + string host = 1; + int32 port = 2; + string database = 3; + string user = 4; + string password = 5; + optional string schema = 6; } message SnowflakeConfig { - string database = 1; - string user = 2; - string password = 3; - string accountIdentifier = 4; - map parameters = 5; - optional string schema = 6; + string database = 1; + string user = 2; + string password = 3; + string accountIdentifier = 4; + map parameters = 5; + optional string schema = 6; } message SqliteConfig { - string path = 1; - optional string schema = 2; + string path = 1; + optional string schema = 2; } message TeradataConfig { - string host = 1; - int32 port = 2; - string database = 3; - string user = 4; - string password = 5; - map parameters = 6; - optional string schema = 7; + string host = 1; + int32 port = 2; + string database = 3; + string user = 4; + string password = 5; + map parameters = 6; + optional string schema = 7; } message GitHubConfig { - string token = 1; - optional string baseUrl = 2; + string token = 1; + optional string baseUrl = 2; } message JiraConfig { - string baseUrl = 1; - string username = 2; - string token = 3; - JiraTokenType tokenType = 4; -} + string baseUrl = 1; + string username = 2; + string token = 3; + JiraTokenType tokenType = 4; -enum JiraTokenType { + enum JiraTokenType { STANDARD_ACCESS_TOKEN = 0; PERSONAL_ACCESS_TOKEN = 1; + } } message ConfluenceConfig { - string baseUrl = 1; - string username = 2; - string token = 3; + string baseUrl = 1; + string username = 2; + string token = 3; } message SalesforceConfig { - string url = 1; - string username = 2; - string password = 3; - string securityToken = 4; - string clientId = 5; - string apiVersion = 6; - repeated string customObjects = 7; + string url = 1; + string username = 2; + string password = 3; + string securityToken = 4; + string clientId = 5; + string apiVersion = 6; + repeated string customObjects = 7; } message DropboxAccessTokenConfig { - string accessToken = 1; + string accessToken = 1; } message DropboxUsernamePasswordConfig { - string username = 1; - string password = 2; + string username = 1; + string password = 2; } message HttpHeadersConfig { - map headers = 1; + map headers = 1; } // This is not used in practice but is kept for compatibility with FDW interface. message SecretConfig { - string name = 1; - string value = 2; + string name = 1; + string value = 2; } message ErrorConfig { - string message = 1; + string message = 1; } \ No newline at end of file diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto index 14c746b5b..cd4effd2a 100644 --- a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/messages.proto @@ -20,7 +20,10 @@ package com.rawlabs.protocol.compiler; message Message { string message = 1; repeated Range positions = 2; - optional string code = 3; + string code = 3; + repeated int32 tags = 4; + Severity severity = 5; + enum Severity { HINT = 0; INFO = 10; diff --git a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto index 4e8fc78f6..412353f4b 100644 --- a/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto +++ b/protocol-compiler/src/main/protobuf/com/rawlabs/protocol/compiler/program_environment.proto @@ -17,6 +17,7 @@ option java_multiple_files = true; package com.rawlabs.protocol.compiler; +import "com/rawlabs/protocol/raw/values.proto"; import "com/rawlabs/protocol/compiler/location_config.proto"; message ProgramEnvironment { @@ -36,5 +37,5 @@ message Arguments { message Argument { string name = 1; - string value = 2; + com.rawlabs.protocol.raw.Value value = 2; } \ No newline at end of file From f5b8f49e34b5157d672447e7e6e898a5742cc6ee Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Fri, 23 Aug 2024 15:49:50 +0200 Subject: [PATCH 5/7] Fix config setting to follow standard conventions (#494) --- .../scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala index 116c1917d..89fd6b393 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala @@ -78,7 +78,7 @@ import scala.util.control.NonFatal object Rql2CompilerService { val LANGUAGE: Set[String] = Set("rql2", "rql2-truffle", "snapi") - val JARS_PATH = "com.rawlabs.snapi.compiler.jars-path" + val JARS_PATH = "raw.snapi.compiler.jars-path" } class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protected val settings: RawSettings) From 577241e768eb7f7d282c8e2789dcdc1890128c6f Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Sat, 24 Aug 2024 08:10:46 +0200 Subject: [PATCH 6/7] Fix Sql builder (#496) --- .../services/com.rawlabs.compiler.CompilerServiceBuilder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder b/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder index e22eda1cd..8f6a977c9 100644 --- a/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder +++ b/sql-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder @@ -1 +1 @@ -com.rawlabs.sql.compiler.impl.SqlCompilerServiceBuilder \ No newline at end of file +com.rawlabs.sql.compiler.SqlCompilerServiceBuilder \ No newline at end of file From b656eb23f4452f14ac1b9e8303d26ffa0c1b4893 Mon Sep 17 00:00:00 2001 From: Miguel Branco Date: Sat, 24 Aug 2024 20:27:49 +0200 Subject: [PATCH 7/7] Rename rql2 to snapi (#497) --- .gitignore | 15 - .../scala/com/rawlabs/compiler/Docs.scala | 2 +- .../main/java/raw/cli/MultilineParser.java | 2 +- .../compiler/PythonCompilerService.scala | 2 +- snapi-compiler/src/main/java/module-info.java | 4 +- ...om.rawlabs.compiler.CompilerServiceBuilder | 2 +- ...rvice.scala => SnapiCompilerService.scala} | 64 +- ...cala => SnapiCompilerServiceBuilder.scala} | 6 +- ...l2CsvWriter.scala => SnapiCsvWriter.scala} | 56 +- ...JsonWriter.scala => SnapiJsonWriter.scala} | 74 +-- ... => SnapiCompilerServiceTestContext.scala} | 16 +- ...ext.scala => SnapiOutputTestContext.scala} | 46 +- ...stContext.scala => SnapiTestContext.scala} | 10 +- .../tests/benchmark/BenchmarkTests.scala | 4 +- .../tests/benchmark/StressTests.scala | 4 +- .../tests/builtin/BinaryPackageTest.scala | 6 +- .../tests/builtin/BytePackageTest.scala | 4 +- .../tests/builtin/CsvPackageTest.scala | 8 +- .../tests/builtin/DatePackageTest.scala | 4 +- .../tests/builtin/DecimalPackageTest.scala | 4 +- .../tests/builtin/DoublePackageTest.scala | 4 +- .../builtin/EnvironmentPackageTest.scala | 4 +- .../tests/builtin/ErrorPackageTest.scala | 4 +- .../tests/builtin/FloatPackageTest.scala | 4 +- .../tests/builtin/FunctionPackageTest.scala | 4 +- .../tests/builtin/HttpPackageTest.scala | 4 +- .../tests/builtin/IntPackageTest.scala | 4 +- .../tests/builtin/IntervalPackageTest.scala | 4 +- .../tests/builtin/JsonPackageTest.scala | 8 +- .../tests/builtin/LocationPackageTest.scala | 6 +- .../tests/builtin/LongPackageTest.scala | 4 +- .../tests/builtin/MathPackageTest.scala | 4 +- .../tests/builtin/NullablePackageTest.scala | 4 +- .../builtin/NullableTryablePackageTest.scala | 4 +- .../tests/builtin/RecordPackageTest.scala | 4 +- .../tests/builtin/RegexPackageTest.scala | 4 +- .../tests/builtin/S3PackageTest.scala | 4 +- .../tests/builtin/ShortPackageTest.scala | 4 +- .../tests/builtin/StringPackageTest.scala | 6 +- .../tests/builtin/SuccessPackageTest.scala | 4 +- .../tests/builtin/TimePackageTest.scala | 4 +- .../tests/builtin/TimestampPackageTest.scala | 4 +- .../tests/builtin/TryPackageTest.scala | 4 +- .../tests/builtin/TypePackageTest.scala | 6 +- .../tests/builtin/XmlPackageTest.scala | 6 +- .../collection/CollectionDistinctTest.scala | 6 +- .../collection/CollectionExplodeTest.scala | 6 +- .../collection/CollectionGroupByTest.scala | 8 +- .../collection/CollectionJoinTest.scala | 8 +- .../collection/CollectionMinMaxTest.scala | 6 +- .../collection/CollectionMkStringTest.scala | 4 +- .../collection/CollectionOrderByTest.scala | 8 +- .../collection/CollectionPackageTest.scala | 8 +- .../collection/CollectionRangeTest.scala | 4 +- .../collection/CollectionUnionTest.scala | 6 +- .../builtin/credentials/AwsPackageTest.scala | 4 +- .../credentials/EnvironmentPackageTest.scala | 4 +- .../credentials/LocationPackageTest.scala | 4 +- .../credentials/MySQLPackageTest.scala | 4 +- .../credentials/OraclePackageTest.scala | 26 +- .../credentials/PostgreSQLPackageTest.scala | 4 +- .../builtin/credentials/S3PackageTest.scala | 4 +- .../credentials/SQLServerPackageTest.scala | 4 +- .../credentials/SnowflakePackageTest.scala | 4 +- .../tests/builtin/list/ListDistinctTest.scala | 6 +- .../tests/builtin/list/ListExplodeTest.scala | 6 +- .../tests/builtin/list/ListGroupByTest.scala | 8 +- .../tests/builtin/list/ListJoinTest.scala | 8 +- .../tests/builtin/list/ListMinMaxTest.scala | 6 +- .../tests/builtin/list/ListMkStringTest.scala | 4 +- .../tests/builtin/list/ListOrderByTest.scala | 8 +- .../tests/builtin/list/ListPackageTest.scala | 8 +- .../tests/builtin/list/ListUnionTest.scala | 6 +- .../hints/SemanticAnalyzerHintsTest.scala | 4 +- .../tests/lsp/LspAiValidateTest.scala | 6 +- .../tests/lsp/LspBrokenCodeTest.scala | 4 +- .../tests/lsp/LspCommentsFormatTest.scala | 4 +- .../lsp/LspCompilationMessagesTest.scala | 4 +- .../tests/lsp/LspDefinitionTest.scala | 4 +- .../tests/lsp/LspDotAutoCompleteTest.scala | 4 +- .../tests/lsp/LspFormatCodeTest.scala | 4 +- .../compiler/tests/lsp/LspHoverTest.scala | 4 +- .../compiler/tests/lsp/LspRenameTest.scala | 4 +- .../compiler/tests/lsp/LspValidateTest.scala | 4 +- .../tests/lsp/LspWordAutoCompleteTest.scala | 4 +- .../tests/offheap/KryoPackageTest.scala | 4 +- .../tests/offheap/OffHeapDatasets.scala | 6 +- .../tests/offheap/OffHeapDistinctTest.scala | 6 +- .../tests/offheap/OffHeapEquiJoinTest.scala | 6 +- .../tests/offheap/OffHeapGroupTest.scala | 6 +- .../tests/offheap/OffHeapJoinTest.scala | 6 +- .../tests/offheap/OffHeapOrderByTest.scala | 6 +- .../tests/output/BinaryOutputTest.scala | 4 +- .../compiler/tests/output/CsvOutputTest.scala | 8 +- .../tests/output/JsonOutputTest.scala | 4 +- .../tests/output/TextOutputTest.scala | 4 +- .../parser/FrontendSyntaxAnalyzerTest.scala | 4 +- .../compiler/tests/parser/ListSugarTest.scala | 4 +- .../tests/parser/OperatorPrecedenceTest.scala | 24 +- .../tests/parser/RecordSugarTest.scala | 4 +- .../tests/regressions/RD10194Test.scala | 4 +- .../tests/regressions/RD10220Test.scala | 4 +- .../tests/regressions/RD10723Test.scala | 4 +- .../tests/regressions/RD10767Test.scala | 6 +- .../tests/regressions/RD10801Test.scala | 6 +- .../tests/regressions/RD3742Test.scala | 4 +- .../tests/regressions/RD3784Test.scala | 6 +- .../tests/regressions/RD4529Test.scala | 4 +- .../tests/regressions/RD4981Test.scala | 6 +- .../tests/regressions/RD5238Test.scala | 6 +- .../tests/regressions/RD5365Test.scala | 8 +- .../tests/regressions/RD5393Test.scala | 6 +- .../tests/regressions/RD5412Test.scala | 4 +- .../tests/regressions/RD5448Test.scala | 6 +- .../tests/regressions/RD5484Test.scala | 4 +- .../tests/regressions/RD5488Test.scala | 4 +- .../tests/regressions/RD5491Test.scala | 4 +- .../tests/regressions/RD5644Test.scala | 4 +- .../tests/regressions/RD5679Test.scala | 6 +- .../tests/regressions/RD5685Test.scala | 4 +- .../tests/regressions/RD5691Test.scala | 4 +- .../tests/regressions/RD5697Test.scala | 6 +- .../tests/regressions/RD5714Test.scala | 4 +- .../tests/regressions/RD5722Test.scala | 4 +- .../tests/regressions/RD572Test.scala | 4 +- .../tests/regressions/RD5775Test.scala | 4 +- .../tests/regressions/RD5779Test.scala | 6 +- .../tests/regressions/RD5784Test.scala | 6 +- .../tests/regressions/RD5785Test.scala | 4 +- .../tests/regressions/RD5786Test.scala | 4 +- .../tests/regressions/RD5851Test.scala | 4 +- .../tests/regressions/RD5884Test.scala | 4 +- .../tests/regressions/RD5893Test.scala | 6 +- .../tests/regressions/RD5914Test.scala | 4 +- .../tests/regressions/RD5920Test.scala | 4 +- .../tests/regressions/RD5921Test.scala | 6 +- .../tests/regressions/RD5925Test.scala | 4 +- .../tests/regressions/RD5932Test.scala | 6 +- .../tests/regressions/RD5968Test.scala | 6 +- .../tests/regressions/RD5971Test.scala | 4 +- .../tests/regressions/RD5979Test.scala | 4 +- .../tests/regressions/RD7924Test.scala | 6 +- .../tests/regressions/RD7974Test.scala | 4 +- .../tests/regressions/RD8530Test.scala | 4 +- .../tests/regressions/RD8764Test.scala | 4 +- .../tests/regressions/RD8935Test.scala | 6 +- .../tests/regressions/RD8993Test.scala | 4 +- .../tests/regressions/RD9137Test.scala | 4 +- .../tests/regressions/RD9228Test.scala | 4 +- .../tests/regressions/RD9229Test.scala | 4 +- .../tests/regressions/RD9255Test.scala | 6 +- .../tests/regressions/RD9359Test.scala | 6 +- .../tests/regressions/RD9409Test.scala | 4 +- .../tests/regressions/RD9445Test.scala | 4 +- .../tests/regressions/RD9479Test.scala | 6 +- .../tests/regressions/RD9485Test.scala | 4 +- .../tests/regressions/RD9554Test.scala | 4 +- .../tests/regressions/RD9616Test.scala | 4 +- .../tests/regressions/RD9932Test.scala | 4 +- .../regressions/credentials/RD3084Test.scala | 8 +- .../regressions/credentials/RD4445Test.scala | 4 +- .../regressions/credentials/RD5932Test.scala | 4 +- .../tests/spec/BasicStagedCompilerTest.scala | 4 +- .../tests/spec/BinaryExpAndTest.scala | 4 +- .../tests/spec/BinaryExpDivTest.scala | 4 +- .../compiler/tests/spec/BinaryExpEqTest.scala | 4 +- .../compiler/tests/spec/BinaryExpGeTest.scala | 4 +- .../compiler/tests/spec/BinaryExpGtTest.scala | 4 +- .../compiler/tests/spec/BinaryExpLeTest.scala | 4 +- .../compiler/tests/spec/BinaryExpLtTest.scala | 4 +- .../tests/spec/BinaryExpModTest.scala | 4 +- .../tests/spec/BinaryExpMultTest.scala | 4 +- .../tests/spec/BinaryExpNeqTest.scala | 4 +- .../compiler/tests/spec/BinaryExpOrTest.scala | 4 +- .../tests/spec/BinaryExpPlusTest.scala | 4 +- .../tests/spec/BinaryExpSubTest.scala | 4 +- .../compiler/tests/spec/ClosureTest.scala | 4 +- .../snapi/compiler/tests/spec/ConstTest.scala | 18 +- .../compiler/tests/spec/ErrorsTest.scala | 4 +- .../compiler/tests/spec/FunAbsTest.scala | 4 +- .../compiler/tests/spec/IfThenElseTest.scala | 4 +- .../tests/spec/ImplicitCastTest.scala | 4 +- .../tests/spec/JoinWithTryRowsTest.scala | 6 +- .../compiler/tests/spec/LetBindTest.scala | 4 +- .../compiler/tests/spec/LetFunRecTest.scala | 6 +- .../compiler/tests/spec/LetFunTest.scala | 6 +- .../compiler/tests/spec/LetTypeTest.scala | 4 +- .../compiler/tests/spec/MigrationTest.scala | 24 +- .../compiler/tests/spec/PackageNameTest.scala | 4 +- .../snapi/compiler/tests/spec/ProjTest.scala | 4 +- .../compiler/tests/spec/PropagationTest.scala | 4 +- .../tests/spec/StagedCompilerTest.scala | 8 +- .../compiler/tests/spec/UnaryExpNegTest.scala | 4 +- .../compiler/tests/spec/UnaryExpNotTest.scala | 4 +- snapi-frontend/src/main/java/module-info.java | 16 +- .../rawlabs/snapi/frontend/base/Tree.scala | 2 +- .../frontend/base/TreeWithPositions.scala | 2 +- .../inferrer/local/LocalInferrerService.scala | 2 +- .../snapi/frontend/rql2/Rql2TypeUtils.scala | 238 -------- .../snapi/frontend/rql2/Rql2Values.scala | 47 -- .../frontend/rql2/source/SourceTree.scala | 559 ------------------ .../CommonSemanticAnalyzer.scala | 4 +- .../FrontendSyntaxAnalyzer.scala | 70 +-- .../frontend/{rql2 => snapi}/Keywords.scala | 2 +- .../{rql2 => snapi}/LspAnalyzer.scala | 32 +- .../{rql2 => snapi}/PhaseDescriptor.scala | 4 +- .../{rql2 => snapi}/PipelinedPhase.scala | 4 +- .../{rql2 => snapi}/ProgramContext.scala | 14 +- .../snapi/frontend/snapi/Rql2Values.scala | 47 ++ .../{rql2 => snapi}/SemanticAnalyzer.scala | 382 ++++++------ .../snapi/frontend/snapi/SnapiTypeUtils.scala | 238 ++++++++ .../{rql2 => snapi}/StagedCompiler.scala | 114 ++-- .../{rql2 => snapi}/SymbolTable.scala | 10 +- .../{rql2 => snapi}/SyntaxAnalyzer.scala | 86 +-- .../snapi/frontend/{rql2 => snapi}/Tree.scala | 6 +- .../{rql2 => snapi}/TreeWithPositions.scala | 6 +- .../antlr4/Antlr4SyntaxAnalyzer.scala | 24 +- .../antlr4/CommentsAntlrSyntaxAnalyzer.scala | 6 +- .../{rql2 => snapi}/antlr4/ParserErrors.scala | 2 +- .../antlr4/SnapiErrorListener.scala} | 4 +- .../antlr4/SnapiPositions.scala} | 4 +- .../antlr4/SnapiVisitor.scala} | 124 ++-- .../antlr4/SnapiVisitorParseErrors.scala} | 4 +- .../{rql2 => snapi}/errors/Errors.scala | 2 +- .../errors/ErrorsPrettyPrinter.scala | 8 +- .../extensions/EntryExtensionProvider.scala | 4 +- .../extensions/LocationDescription.scala | 2 +- .../extensions/PackageExtension.scala | 96 +-- .../extensions/PackageExtensionProvider.scala | 6 +- .../extensions/builtin/Aggregations.scala | 44 +- .../extensions/builtin/AwsPackage.scala | 18 +- .../extensions/builtin/BinaryPackage.scala | 20 +- .../extensions/builtin/BytePackage.scala | 16 +- .../builtin/CollectionPackage.scala | 288 ++++----- .../extensions/builtin/CsvPackage.scala | 154 ++--- .../extensions/builtin/DatePackage.scala | 48 +- .../extensions/builtin/DecimalPackage.scala | 20 +- .../extensions/builtin/DoublePackage.scala | 16 +- .../builtin/EnvironmentPackage.scala | 14 +- .../extensions/builtin/ErrorPackage.scala | 20 +- .../extensions/builtin/FloatPackage.scala | 16 +- .../extensions/builtin/FunctionPackage.scala | 8 +- .../extensions/builtin/HttpPackage.scala | 72 +-- .../extensions/builtin/IntPackage.scala | 22 +- .../extensions/builtin/IntervalPackage.scala | 56 +- .../extensions/builtin/JsonPackage.scala | 100 ++-- .../extensions/builtin/KryoPackage.scala | 12 +- .../extensions/builtin/LibraryPackage.scala | 18 +- .../extensions/builtin/ListPackage.scala | 204 +++---- .../extensions/builtin/LocationPackage.scala | 86 +-- .../extensions/builtin/LongPackage.scala | 22 +- .../extensions/builtin/MathPackage.scala | 94 +-- .../extensions/builtin/MySQLPackage.scala | 58 +- .../extensions/builtin/NullablePackage.scala | 32 +- .../builtin/NullableTryablePackage.scala | 8 +- .../extensions/builtin/OraclePackage.scala | 56 +- .../builtin/PostgreSQLPackage.scala | 58 +- .../extensions/builtin/RecordPackage.scala | 40 +- .../extensions/builtin/RegexPackage.scala | 38 +- .../extensions/builtin/S3Package.scala | 18 +- .../extensions/builtin/SQLServerPackage.scala | 58 +- .../extensions/builtin/ShortPackage.scala | 16 +- .../extensions/builtin/SnowflakePackage.scala | 94 +-- .../extensions/builtin/StringPackage.scala | 134 ++--- .../extensions/builtin/SuccessPackage.scala | 16 +- .../extensions/builtin/TestPackage.scala | 99 ++-- .../extensions/builtin/TimePackage.scala | 48 +- .../extensions/builtin/TimestampPackage.scala | 88 +-- .../extensions/builtin/TryPackage.scala | 26 +- .../extensions/builtin/TypePackage.scala | 35 +- .../extensions/builtin/XmlPackage.scala | 83 +-- .../frontend/{rql2 => snapi}/package.scala | 4 +- .../phases/ImplicitCastsPhase.scala | 132 ++--- .../phases/ListProjDesugarerPhase.scala | 14 +- .../phases/PropagationPhase.scala | 52 +- .../phases/SugarExtensionDesugarerPhase.scala | 8 +- .../source/SourceCommentsPrettyPrinter.scala | 22 +- .../source/SourcePrettyPrinter.scala | 96 +-- .../frontend/snapi/source/SourceTree.scala | 559 ++++++++++++++++++ .../snapi/frontend/rql2/Antlr4LspTests.scala | 16 +- .../snapi/frontend/rql2/Antlr4TypeTests.scala | 150 ++--- .../FrontendSyntaxAnalyzerCompareTest.scala | 8 +- .../rql2/OldFrontendSyntaxAnalyzerTest.scala | 105 ++-- .../snapi/frontend/rql2/PrettyPrintTest.scala | 4 +- .../rql2/SyntaxAnalyzerCompareTest.scala | 8 +- .../{Rql2Context.java => SnapiContext.java} | 16 +- .../{Rql2Language.java => SnapiLanguage.java} | 58 +- ...uageCache.java => SnapiLanguageCache.java} | 10 +- .../{Rql2Options.java => SnapiOptions.java} | 4 +- .../{Rql2Types.java => SnapiTypes.java} | 2 +- .../snapi/truffle/ast/ExpressionNode.java | 40 +- .../truffle/ast/ProgramExpressionNode.java | 6 +- .../truffle/ast/ProgramStatementNode.java | 4 +- .../rawlabs/snapi/truffle/ast/TypeGuards.java | 154 ++--- .../aws_package/AwsV4SignedRequestNode.java | 12 +- .../EnvironmentParameterNode.java | 34 +- .../EnvironmentSecretNode.java | 4 +- .../builtin/http_package/HttpReadNode.java | 6 +- .../builtin/jdbc/JdbcQueryNode.java | 4 +- .../LocationDescribeNode.java | 60 +- .../LocationFromHttpNode.java | 4 +- .../LocationFromMySQLCredentialNode.java | 4 +- .../LocationFromMySQLNode.java | 4 +- .../LocationFromOracleCredentialNode.java | 4 +- .../LocationFromOracleNode.java | 4 +- .../LocationFromPostgreSQLCredentialNode.java | 4 +- .../LocationFromPostgreSQLNode.java | 4 +- .../location_package/LocationFromS3Node.java | 4 +- .../LocationFromSQLServerCredentialNode.java | 4 +- .../LocationFromSQLServerNode.java | 4 +- .../LocationFromSnowflakeCredentialNode.java | 4 +- .../LocationFromSnowflakeNode.java | 4 +- .../LocationFromStringNode.java | 8 +- .../location_package/LocationLlNode.java | 10 +- .../location_package/LocationLsNode.java | 2 +- .../ast/expressions/function/MethodNode.java | 4 +- .../iterable/ArrayOperationNodes.java | 22 +- .../collection/CollectionDistinctNode.java | 6 +- .../collection/CollectionEquiJoinNode.java | 14 +- .../collection/CollectionGroupByNode.java | 10 +- .../collection/CollectionJoinNode.java | 6 +- .../collection/CollectionOrderByNode.java | 10 +- .../collection/CollectionTupleAvgNode.java | 4 +- .../collection/CollectionZipNode.java | 4 +- .../iterable/list/ListBuildNode.java | 22 +- .../iterable/list/ListFilterNode.java | 6 +- .../iterable/list/ListFromNode.java | 6 +- .../iterable/list/ListFromUnsafe.java | 6 +- .../iterable/list/ListGroupByNode.java | 10 +- .../iterable/list/ListTransformNode.java | 6 +- .../literals/LocationConstNode.java | 6 +- .../expressions/literals/ZeroedConstNode.java | 20 +- .../record/RecordAddFieldNode.java | 4 +- .../expressions/record/RecordBuildNode.java | 4 +- .../expressions/record/RecordConcatNode.java | 4 +- .../record/RecordRemoveFieldNode.java | 4 +- .../record/RecordStaticInitializers.java | 6 +- .../ast/io/binary/BinaryWriterNode.java | 4 +- .../csv/reader/parser/RecordParseCsvNode.java | 12 +- .../csv/reader/parser/TruffleCsvParser.java | 4 +- .../io/csv/writer/CsvIterableWriterNode.java | 4 +- .../ast/io/csv/writer/CsvListWriterNode.java | 4 +- .../ast/io/jdbc/RecordReadJdbcQuery.java | 12 +- .../ast/io/json/reader/JsonParserNodes.java | 8 +- .../json/reader/parser/ListParseJsonNode.java | 6 +- .../reader/parser/RecordParseJsonNode.java | 14 +- .../truffle/ast/io/kryo/KryoFromNode.java | 6 +- .../truffle/ast/io/kryo/KryoWriteNode.java | 6 +- .../ast/io/xml/parser/RecordParseXmlNode.java | 16 +- .../ast/local/ReadClosureVariableNode.java | 24 +- .../ast/local/ReadLocalVariableNode.java | 20 +- .../ast/local/WriteLocalVariableNode.java | 20 +- .../ast/osr/bodies/OSRToArrayBodyNode.java | 7 +- .../truffle/emitter/SnapiTruffleEmitter.java | 82 +-- .../snapi/truffle/emitter/TruffleEmit.java | 18 +- .../snapi/truffle/emitter/TruffleEmitter.java | 10 +- .../emitter/TruffleEntryExtension.java | 12 +- .../emitter/TruffleShortEntryExtension.java | 6 +- .../emitter/builtin/CompilerScalaConsts.java | 8 +- .../truffle/emitter/builtin/WithArgs.java | 8 +- .../TruffleAwsV4SignedRequestEntry.java | 20 +- .../TruffleBinaryBase64Entry.java | 4 +- .../TruffleBinaryReadEntry.java | 4 +- .../TruffleFromStringBinaryEntry.java | 4 +- .../byte_extension/TruffleByteFromEntry.java | 6 +- .../TruffleBuildCollectionEntry.java | 6 +- .../TruffleCountCollectionEntry.java | 8 +- .../TruffleDistinctCollectionEntry.java | 14 +- .../TruffleEmptyCollectionEntry.java | 6 +- .../TruffleExistsCollectionEntry.java | 8 +- .../TruffleFilterCollectionEntry.java | 8 +- .../TruffleFirstCollectionEntry.java | 6 +- .../TruffleFromCollectionEntry.java | 6 +- .../TruffleGroupCollectionEntry.java | 34 +- ...ruffleInternalEquiJoinCollectionEntry.java | 24 +- .../TruffleInternalJoinCollectionEntry.java | 18 +- .../TruffleLastCollectionEntry.java | 8 +- .../TruffleMaxCollectionEntry.java | 8 +- .../TruffleMinCollectionEntry.java | 8 +- .../TruffleMkStringCollectionEntry.java | 8 +- .../TruffleOrderByCollectionEntry.java | 24 +- .../TruffleSumCollectionEntry.java | 8 +- .../TruffleTakeCollectionEntry.java | 6 +- .../TruffleTransformCollectionEntry.java | 6 +- .../TruffleTupleAvgCollectionEntry.java | 8 +- .../TruffleUnionCollectionEntry.java | 6 +- .../TruffleUnnestCollectionEntry.java | 6 +- .../TruffleZipCollectionEntry.java | 6 +- .../builtin/csv_extension/CsvParser.java | 84 +-- .../csv_extension/TruffleCsvParseEntry.java | 10 +- .../csv_extension/TruffleCsvReadEntry.java | 10 +- .../TruffleDateAddIntervalEntry.java | 4 +- .../date_extension/TruffleDateBuildEntry.java | 4 +- .../date_extension/TruffleDateDayEntry.java | 4 +- .../TruffleDateFromEpochDayEntry.java | 4 +- .../TruffleDateFromTimestampEntry.java | 4 +- .../date_extension/TruffleDateMonthEntry.java | 4 +- .../date_extension/TruffleDateNowEntry.java | 4 +- .../date_extension/TruffleDateParseEntry.java | 4 +- .../TruffleDateSubtractEntry.java | 4 +- .../TruffleDateSubtractIntervalEntry.java | 4 +- .../date_extension/TruffleDateYearEntry.java | 4 +- .../TruffleDecimalFromEntry.java | 6 +- .../TruffleDecimalRoundEntry.java | 4 +- .../TruffleDoubleFromEntry.java | 6 +- .../TruffleEnvironmentParameterEntry.java | 10 +- .../TruffleEnvironmentScopesEntry.java | 4 +- .../TruffleEnvironmentSecretEntry.java | 4 +- .../TruffleErrorBuildEntry.java | 6 +- .../TruffleErrorBuildWithTypeEntry.java | 6 +- .../error_extension/TruffleErrorGetEntry.java | 6 +- .../TruffleFloatFromEntry.java | 6 +- .../TruffleFunctionInvokeAfterEntry.java | 6 +- .../http_extension/TruffleHttpCallEntry.java | 6 +- .../http_extension/TruffleHttpReadEntry.java | 4 +- .../http_extension/TruffleHttpUrlDecode.java | 4 +- .../http_extension/TruffleHttpUrlEncode.java | 4 +- .../int_extension/TruffleIntFromEntry.java | 6 +- .../int_extension/TruffleIntRangeEntry.java | 6 +- .../TruffleBuildIntervalEntry.java | 6 +- .../TruffleIntervalDaysEntry.java | 4 +- .../TruffleIntervalFromMillisEntry.java | 4 +- .../TruffleIntervalHoursEntry.java | 4 +- .../TruffleIntervalMillisEntry.java | 4 +- .../TruffleIntervalMinutesEntry.java | 4 +- .../TruffleIntervalMonthsEntry.java | 4 +- .../TruffleIntervalParseEntry.java | 4 +- .../TruffleIntervalSecondsEntry.java | 4 +- .../TruffleIntervalToMillisEntry.java | 4 +- .../TruffleIntervalWeeksEntry.java | 4 +- .../TruffleIntervalYearsEntry.java | 4 +- .../truffle/emitter/builtin/jdbc/Jdbc.java | 46 +- .../builtin/json_extension/JsonParser.java | 82 +-- .../json_extension/TruffleParseJsonEntry.java | 12 +- .../json_extension/TrufflePrintJsonEntry.java | 10 +- .../json_extension/TruffleReadJsonEntry.java | 18 +- .../TruffleKryoDecodeEntry.java | 12 +- .../TruffleKryoEncodeEntry.java | 10 +- .../list_extension/TruffleBuildListEntry.java | 6 +- .../list_extension/TruffleCountListEntry.java | 6 +- .../list_extension/TruffleEmptyListEntry.java | 6 +- .../TruffleExistsListEntry.java | 8 +- .../TruffleFilterListEntry.java | 16 +- .../list_extension/TruffleFirstListEntry.java | 6 +- .../list_extension/TruffleFromListEntry.java | 16 +- .../list_extension/TruffleGetListEntry.java | 6 +- .../list_extension/TruffleGroupListEntry.java | 32 +- .../list_extension/TruffleLastListEntry.java | 6 +- .../list_extension/TruffleMaxListEntry.java | 8 +- .../list_extension/TruffleMinListEntry.java | 8 +- .../list_extension/TruffleSumListEntry.java | 8 +- .../list_extension/TruffleTakeListEntry.java | 6 +- .../TruffleTransformListEntry.java | 14 +- .../TruffleUnsafeFromListEntry.java | 16 +- .../TruffleLocationDescribeEntry.java | 6 +- .../TruffleLocationFromStringEntry.java | 6 +- .../TruffleLocationLlEntry.java | 6 +- .../TruffleLocationLsEntry.java | 6 +- .../long_extension/TruffleLongFromEntry.java | 6 +- .../long_extension/TruffleLongRangeEntry.java | 6 +- .../math_extension/TruffleMathAbsEntry.java | 6 +- .../math_extension/TruffleMathAcosEntry.java | 4 +- .../math_extension/TruffleMathAsinEntry.java | 4 +- .../math_extension/TruffleMathAtanEntry.java | 4 +- .../math_extension/TruffleMathAtn2Entry.java | 4 +- .../TruffleMathCeilingEntry.java | 4 +- .../math_extension/TruffleMathCosEntry.java | 4 +- .../math_extension/TruffleMathCotEntry.java | 4 +- .../TruffleMathDegreesEntry.java | 4 +- .../math_extension/TruffleMathExpEntry.java | 4 +- .../math_extension/TruffleMathFloorEntry.java | 4 +- .../math_extension/TruffleMathLog10Entry.java | 4 +- .../math_extension/TruffleMathLogEntry.java | 4 +- .../math_extension/TruffleMathPiEntry.java | 4 +- .../math_extension/TruffleMathPowerEntry.java | 4 +- .../TruffleMathRadiansEntry.java | 4 +- .../TruffleMathRandomEntry.java | 4 +- .../math_extension/TruffleMathSignEntry.java | 4 +- .../math_extension/TruffleMathSinEntry.java | 4 +- .../math_extension/TruffleMathSqrtEntry.java | 4 +- .../TruffleMathSquareEntry.java | 4 +- .../math_extension/TruffleMathTanEntry.java | 4 +- .../TruffleMySQLQueryEntry.java | 6 +- .../TruffleNullableBuildEntry.java | 6 +- .../TruffleNullableEmptyEntry.java | 6 +- .../TruffleNullableIsNullEntry.java | 6 +- .../TruffleNullableTransformEntry.java | 6 +- .../TruffleNullableUnsafeGetEntry.java | 6 +- .../TruffleFlatMapNullableTryableEntry.java | 16 +- .../TruffleOracleQueryEntry.java | 6 +- .../TrufflePostgreSQLQueryEntry.java | 6 +- .../TruffleRecordAddFieldEntry.java | 10 +- .../TruffleRecordBuildEntry.java | 16 +- .../TruffleRecordConcatEntry.java | 6 +- .../TruffleRecordFieldsEntry.java | 6 +- .../TruffleRecordGetFieldByIndexEntry.java | 6 +- .../TruffleRecordRemoveFieldEntry.java | 22 +- .../TruffleRegexFirstMatchInEntry.java | 6 +- .../TruffleRegexGroupsEntry.java | 6 +- .../TruffleRegexMatchesEntry.java | 6 +- .../TruffleRegexReplaceEntry.java | 6 +- .../s3_extension/TruffleS3BuildEntry.java | 6 +- .../TruffleShortFromEntry.java | 6 +- .../TruffleSnowflakeQueryEntry.java | 6 +- .../TruffleSQLServerQueryEntry.java | 6 +- .../TruffleBase64EntryExtension.java | 4 +- .../TruffleStringCapitalizeEntry.java | 4 +- .../TruffleStringContainsEntry.java | 4 +- .../TruffleStringCountSubStringEntry.java | 4 +- .../TruffleStringDecodeEntry.java | 4 +- .../TruffleStringEmptyEntry.java | 4 +- .../TruffleStringEncodeEntry.java | 4 +- .../TruffleStringFromEntry.java | 6 +- .../TruffleStringLTrimEntry.java | 4 +- .../TruffleStringLengthEntry.java | 4 +- ...TruffleStringLevenshteinDistanceEntry.java | 4 +- .../TruffleStringLowerEntry.java | 4 +- .../TruffleStringRTrimEntry.java | 4 +- .../TruffleStringReadEntry.java | 6 +- .../TruffleStringReadLinesEntry.java | 6 +- .../TruffleStringReplaceEntry.java | 6 +- .../TruffleStringReplicateEntry.java | 4 +- .../TruffleStringReverseEntry.java | 4 +- .../TruffleStringSplitEntry.java | 4 +- .../TruffleStringStartsWithEntry.java | 4 +- .../TruffleStringSubStringEntry.java | 4 +- .../TruffleStringTrimEntry.java | 4 +- .../TruffleStringUpperEntry.java | 4 +- .../TruffleSuccessBuildEntry.java | 6 +- .../TruffleBoolValueArgTestEntry.java | 2 +- .../TruffleByteValueArgTestEntry.java | 2 +- .../TruffleDateValueArgTestEntry.java | 2 +- .../TruffleDoubleValueArgTestEntry.java | 2 +- .../TruffleFloatValueArgTestEntry.java | 2 +- .../TruffleIntValueArgTestEntry.java | 2 +- .../TruffleIntervalValueArgTestEntry.java | 2 +- .../TruffleListValueArgTestEntry.java | 2 +- .../TruffleLongValueArgTestEntry.java | 2 +- .../test_extension/TruffleMandatoryArgs.java | 4 +- .../TruffleMandatoryExpArgsEntry.java | 2 +- .../TruffleMandatoryValueArgsEntry.java | 2 +- .../test_extension/TruffleOptionalArgs.java | 4 +- .../TruffleOptionalExpArgsTestEntry.java | 2 +- .../TruffleOptionalValueArgsTestEntry.java | 2 +- .../TruffleRecordValueArgTestEntry.java | 2 +- .../TruffleShortValueArgTestEntry.java | 2 +- ...ffleStrictArgsColPassThroughTestEntry.java | 6 +- .../TruffleStrictArgsTestEntry.java | 6 +- .../TruffleStringValueArgTestEntry.java | 2 +- .../TruffleTimeValueArgTestEntry.java | 2 +- .../TruffleTimestampValueArgTestEntry.java | 2 +- .../test_extension/TruffleValueArg.java | 4 +- .../test_extension/TruffleVarArgs.java | 4 +- .../TruffleVarExpArgsTestEntry.java | 2 +- .../TruffleVarNullableStringExpTestEntry.java | 6 +- ...ruffleVarNullableStringValueTestEntry.java | 6 +- .../TruffleVarValueArgsTestEntry.java | 2 +- .../TruffleTimeAddIntervalEntry.java | 4 +- .../time_extension/TruffleTimeBuildEntry.java | 4 +- .../time_extension/TruffleTimeHourEntry.java | 4 +- .../TruffleTimeMillisEntry.java | 4 +- .../TruffleTimeMinuteEntry.java | 4 +- .../time_extension/TruffleTimeNowEntry.java | 4 +- .../time_extension/TruffleTimeParseEntry.java | 4 +- .../TruffleTimeSecondEntry.java | 4 +- .../TruffleTimeSubtractEntry.java | 4 +- .../TruffleTimeSubtractIntervalEntry.java | 4 +- .../TruffleTimestampAddIntervalEntry.java | 4 +- .../TruffleTimestampBuildEntry.java | 4 +- .../TruffleTimestampDayEntry.java | 4 +- .../TruffleTimestampFromDateEntry.java | 4 +- ...ruffleTimestampFromUnixTimestampEntry.java | 4 +- .../TruffleTimestampHourEntry.java | 4 +- .../TruffleTimestampMillisEntry.java | 4 +- .../TruffleTimestampMinuteEntry.java | 4 +- .../TruffleTimestampMonthEntry.java | 4 +- .../TruffleTimestampNowEntry.java | 4 +- .../TruffleTimestampParseEntry.java | 4 +- .../TruffleTimestampRangeEntry.java | 6 +- .../TruffleTimestampSecondEntry.java | 4 +- .../TruffleTimestampSubtractEntry.java | 4 +- ...TruffleTimestampSubtractIntervalEntry.java | 4 +- .../TruffleTimestampTimeBucketEntry.java | 14 +- .../TruffleTimestampToUnixTimestampEntry.java | 4 +- .../TruffleTimestampYearEntry.java | 4 +- .../try_extension/TruffleTryFlatMapEntry.java | 6 +- .../try_extension/TruffleTryIsErrorEntry.java | 6 +- .../TruffleTryIsSuccessEntry.java | 6 +- .../TruffleTryTransformEntry.java | 6 +- .../TruffleTryUnsafeGetEntry.java | 6 +- .../type_extension/TruffleTypeCastEntry.java | 6 +- .../type_extension/TruffleTypeEmptyEntry.java | 10 +- .../type_extension/TruffleTypeMatchEntry.java | 14 +- .../TruffleTypeProtectCastEntry.java | 64 +- .../xml_extension/TruffleParseXmlEntry.java | 30 +- .../xml_extension/TruffleReadXmlEntry.java | 30 +- .../builtin/xml_extension/XmlRecurse.java | 70 +-- .../emitter/writers/CompilerScalaConsts.java | 8 +- .../truffle/emitter/writers/CsvWriter.java | 42 +- .../truffle/emitter/writers/JsonWriter.java | 66 +-- .../emitter/writers/TruffleBinaryWriter.java | 34 +- .../function/FunctionRegistryObject.java | 4 +- .../collection/StaticInitializers.java | 22 +- .../compute_next/ComputeNextNodes.java | 12 +- .../operations/EquiJoinComputeNext.java | 16 +- .../operations/JoinComputeNext.java | 8 +- .../input_buffer/InputBufferNodes.java | 4 +- .../off_heap/distinct/OffHeapDistinct.java | 8 +- .../off_heap/group_by/OffHeapGroupByKey.java | 12 +- .../off_heap/order_by/OffHeapGroupByKeys.java | 18 +- .../record_shaper/RecordShaperNodes.java | 10 +- .../operations/DistinctCollection.java | 8 +- .../operations/EquiJoinCollection.java | 12 +- .../operations/GroupByCollection.java | 14 +- .../iterable/operations/JoinCollection.java | 6 +- .../operations/OrderByCollection.java | 14 +- .../iterable/operations/ZipCollection.java | 4 +- .../snapi/truffle/runtime/kryo/KryoNodes.java | 134 ++--- .../snapi/truffle/runtime/or/OrObject.java | 4 +- .../runtime/primitives/DateObject.java | 4 +- .../runtime/primitives/DecimalObject.java | 4 +- .../runtime/primitives/LocationObject.java | 4 +- .../runtime/record/DuplicateKeyRecord.java | 4 +- .../truffle/runtime/record/PureRecord.java | 4 +- .../runtime/record/PureRecordNodes.java | 4 +- .../truffle/runtime/utils/KryoFootPrint.java | 50 +- snapi-truffle/src/main/java/module-info.java | 4 +- 627 files changed, 5142 insertions(+), 5132 deletions(-) rename snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/{Rql2CompilerService.scala => SnapiCompilerService.scala} (92%) rename snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/{Rql2CompilerServiceBuilder.scala => SnapiCompilerServiceBuilder.scala} (79%) rename snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/{Rql2CsvWriter.scala => SnapiCsvWriter.scala} (77%) rename snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/{Rql2JsonWriter.scala => SnapiJsonWriter.scala} (66%) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/{Rql2CompilerServiceTestContext.scala => SnapiCompilerServiceTestContext.scala} (87%) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/{Rql2OutputTestContext.scala => SnapiOutputTestContext.scala} (76%) rename snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/{Rql2TestContext.scala => SnapiTestContext.scala} (99%) delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala delete mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/CommonSemanticAnalyzer.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/FrontendSyntaxAnalyzer.scala (81%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/Keywords.scala (97%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/LspAnalyzer.scala (95%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/PhaseDescriptor.scala (92%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/PipelinedPhase.scala (94%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/ProgramContext.scala (79%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Rql2Values.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/SemanticAnalyzer.scala (82%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SnapiTypeUtils.scala rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/StagedCompiler.scala (65%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/SymbolTable.scala (78%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/SyntaxAnalyzer.scala (79%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/Tree.scala (86%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/TreeWithPositions.scala (84%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/antlr4/Antlr4SyntaxAnalyzer.scala (75%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/antlr4/CommentsAntlrSyntaxAnalyzer.scala (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/antlr4/ParserErrors.scala (90%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2/antlr4/Rql2ErrorListener.scala => snapi/antlr4/SnapiErrorListener.scala} (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2/antlr4/Rql2Positions.scala => snapi/antlr4/SnapiPositions.scala} (95%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2/antlr4/Rql2SnapiVisitor.scala => snapi/antlr4/SnapiVisitor.scala} (93%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2/antlr4/Rql2VisitorParseErrors.scala => snapi/antlr4/SnapiVisitorParseErrors.scala} (88%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/errors/Errors.scala (99%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/errors/ErrorsPrettyPrinter.scala (93%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/EntryExtensionProvider.scala (98%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/LocationDescription.scala (99%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/PackageExtension.scala (79%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/PackageExtensionProvider.scala (90%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/Aggregations.scala (67%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/AwsPackage.scala (88%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/BinaryPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/BytePackage.scala (81%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/CollectionPackage.scala (83%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/CsvPackage.scala (84%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/DatePackage.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/DecimalPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/DoublePackage.scala (81%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/EnvironmentPackage.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/ErrorPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/FloatPackage.scala (81%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/FunctionPackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/HttpPackage.scala (78%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/IntPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/IntervalPackage.scala (90%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/JsonPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/KryoPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/LibraryPackage.scala (96%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/ListPackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/LocationPackage.scala (75%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/LongPackage.scala (85%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/MathPackage.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/MySQLPackage.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/NullablePackage.scala (83%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/NullableTryablePackage.scala (88%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/OraclePackage.scala (92%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/PostgreSQLPackage.scala (92%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/RecordPackage.scala (90%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/RegexPackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/S3Package.scala (81%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/SQLServerPackage.scala (92%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/ShortPackage.scala (81%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/SnowflakePackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/StringPackage.scala (88%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/SuccessPackage.scala (76%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/TestPackage.scala (79%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/TimePackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/TimestampPackage.scala (88%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/TryPackage.scala (87%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/TypePackage.scala (88%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/extensions/builtin/XmlPackage.scala (83%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/package.scala (94%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/phases/ImplicitCastsPhase.scala (79%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/phases/ListProjDesugarerPhase.scala (78%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/phases/PropagationPhase.scala (89%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/phases/SugarExtensionDesugarerPhase.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/source/SourceCommentsPrettyPrinter.scala (91%) rename snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/{rql2 => snapi}/source/SourcePrettyPrinter.scala (77%) create mode 100644 snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceTree.scala rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{Rql2Context.java => SnapiContext.java} (91%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{Rql2Language.java => SnapiLanguage.java} (84%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{Rql2LanguageCache.java => SnapiLanguageCache.java} (90%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{Rql2Options.java => SnapiOptions.java} (95%) rename snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/{Rql2Types.java => SnapiTypes.java} (96%) diff --git a/.gitignore b/.gitignore index 3fc068366..00f777121 100644 --- a/.gitignore +++ b/.gitignore @@ -64,21 +64,6 @@ target/ /.project *.iml -language/version -extensions/version -utils/version -client/version -snapi-client/version -sql-client/version -snapi-frontend/version -snapi-truffle/version -sql-parser/version -snapi-parser/version -python-client/version - -snapi-parser/src/main/java/raw/compiler/rql2/generated -sql-parser/src/main/java/raw/client/sql/generated - **/pom.xml.versionsBackup version diff --git a/compiler/src/main/scala/com/rawlabs/compiler/Docs.scala b/compiler/src/main/scala/com/rawlabs/compiler/Docs.scala index 8189e7cc6..aaf41b2c2 100644 --- a/compiler/src/main/scala/com/rawlabs/compiler/Docs.scala +++ b/compiler/src/main/scala/com/rawlabs/compiler/Docs.scala @@ -69,7 +69,7 @@ final case class ExampleDoc( result: Option[String] = None ) { if (example.contains("```")) throw new AssertionError( - "Example code contains ``` and this isn't supported. Must only contain RQL2 code." + "Example code contains ``` and this isn't supported. Must only contain Snapi code." ) // if ( // !example.contains("s3://") && !example.contains("https://") && !example diff --git a/launcher/src/main/java/raw/cli/MultilineParser.java b/launcher/src/main/java/raw/cli/MultilineParser.java index 5a8c31cac..671ac508f 100644 --- a/launcher/src/main/java/raw/cli/MultilineParser.java +++ b/launcher/src/main/java/raw/cli/MultilineParser.java @@ -35,7 +35,7 @@ // compilerService.parse(line) // // -// case Success(result: Rql2Program, _) => +// case Success(result: SnapiProgram, _) => // // If success, let's just check it is a program with an expression. // // If so, we keep going and ask for more input. // // This handles cases like: diff --git a/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala b/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala index 92e4b14f2..3aed791cf 100644 --- a/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala +++ b/python-compiler/src/main/scala/com/rawlabs/python/compiler/PythonCompilerService.scala @@ -29,7 +29,7 @@ class PythonCompilerService(engineDefinition: (Engine, Boolean))(implicit protec // This is actually the "default constructor" which obtains a new engine or reuses an existing one. // Note that the engine will be released when the service is stopped only IF this auxiliary constructor created it. // Otherwise, we expect the external party - e.g. the test framework - to close it. - // Refer to Rql2TruffleCompilerServiceTestContext to see the engine being created and released from the test + // Refer to SnapiTruffleCompilerServiceTestContext to see the engine being created and released from the test // framework, so that every test suite instance has a fresh engine. def this()(implicit settings: RawSettings) = { this(CompilerService.getEngine) diff --git a/snapi-compiler/src/main/java/module-info.java b/snapi-compiler/src/main/java/module-info.java index 62091979a..b16f22131 100644 --- a/snapi-compiler/src/main/java/module-info.java +++ b/snapi-compiler/src/main/java/module-info.java @@ -11,7 +11,7 @@ */ import com.rawlabs.compiler.CompilerServiceBuilder; -import com.rawlabs.snapi.compiler.Rql2CompilerServiceBuilder; +import com.rawlabs.snapi.compiler.SnapiCompilerServiceBuilder; module raw.snapi.client { requires scala.library; @@ -29,5 +29,5 @@ uses CompilerServiceBuilder; provides CompilerServiceBuilder with - Rql2CompilerServiceBuilder; + SnapiCompilerServiceBuilder; } diff --git a/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder b/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder index 4028de508..cbfa4f9c3 100644 --- a/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder +++ b/snapi-compiler/src/main/resources/META-INF/services/com.rawlabs.compiler.CompilerServiceBuilder @@ -1 +1 @@ -com.rawlabs.snapi.compiler.Rql2CompilerServiceBuilder \ No newline at end of file +com.rawlabs.snapi.compiler.SnapiCompilerServiceBuilder \ No newline at end of file diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/SnapiCompilerService.scala similarity index 92% rename from snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/SnapiCompilerService.scala index 89fd6b393..d38337e20 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerService.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/SnapiCompilerService.scala @@ -54,7 +54,7 @@ import com.rawlabs.compiler.{ ValidateResponse } import com.rawlabs.compiler.writers.{PolyglotBinaryWriter, PolyglotTextWriter} -import com.rawlabs.snapi.compiler.writers.{Rql2CsvWriter, Rql2JsonWriter} +import com.rawlabs.snapi.compiler.writers.{SnapiCsvWriter, SnapiJsonWriter} import com.rawlabs.utils.core.{RawSettings, RawUid, RawUtils} import org.bitbucket.inkytonik.kiama.relation.LeaveAlone import org.bitbucket.inkytonik.kiama.util.{Position, Positions} @@ -63,32 +63,32 @@ import com.rawlabs.snapi.frontend.base import com.rawlabs.snapi.frontend.base.errors._ import com.rawlabs.snapi.frontend.base.source.{BaseNode, Type} import com.rawlabs.snapi.frontend.base.{CompilerContext, TreeDeclDescription, TreeDescription, TreeParamDescription} -import com.rawlabs.snapi.frontend.rql2.source.{SourceNode, SourceProgram} -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult, ParseTypeResult, ParserErrors} -import com.rawlabs.snapi.frontend.rql2.errors._ -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source.{SourceNode, SourceProgram} +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult, ParseTypeResult, ParserErrors} +import com.rawlabs.snapi.frontend.snapi.errors._ +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.snapi.frontend.inferrer.api.InferrerServiceProvider -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{BinaryPackage, CsvPackage, JsonPackage, StringPackage} +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{BinaryPackage, CsvPackage, JsonPackage, StringPackage} import java.io.{IOException, OutputStream} import scala.collection.mutable import scala.util.control.NonFatal -object Rql2CompilerService { - val LANGUAGE: Set[String] = Set("rql2", "rql2-truffle", "snapi") +object SnapiCompilerService { + val LANGUAGE: Set[String] = Set("snapi") val JARS_PATH = "raw.snapi.compiler.jars-path" } -class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protected val settings: RawSettings) +class SnapiCompilerService(engineDefinition: (Engine, Boolean))(implicit protected val settings: RawSettings) extends CompilerService with CustomClassAndModuleLoader - with Rql2TypeUtils { + with SnapiTypeUtils { private val maybeTruffleClassLoader: Option[ClassLoader] = { // If defined, contains the path used to create a classloader for the Truffle language runtime. - val maybeJarsPath = settings.getStringOpt(Rql2CompilerService.JARS_PATH) + val maybeJarsPath = settings.getStringOpt(SnapiCompilerService.JARS_PATH) // If the jars path is defined, create a custom class loader. maybeJarsPath.map(jarsPath => createCustomClassAndModuleLoader(jarsPath)) @@ -101,13 +101,13 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte // This is actually the "default constructor" which obtains a new engine or reuses an existing one. // Note that the engine will be released when the service is stopped only IF this auxiliary constructor created it. // Otherwise, we expect the external party - e.g. the test framework - to close it. - // Refer to Rql2TruffleCompilerServiceTestContext to see the engine being created and released from the test + // Refer to SnapiTruffleCompilerServiceTestContext to see the engine being created and released from the test // framework, so that every test suite instance has a fresh engine. def this()(implicit settings: RawSettings) = { this(CompilerService.getEngine) } - override def language: Set[String] = Rql2CompilerService.LANGUAGE + override def language: Set[String] = SnapiCompilerService.LANGUAGE // Map of users to compiler context. private val compilerContextCaches = new mutable.HashMap[RawUid, CompilerContext] @@ -115,7 +115,7 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte private def getCompilerContext(user: RawUid): CompilerContext = { compilerContextCachesLock.synchronized { - compilerContextCaches.getOrElseUpdate(user, createCompilerContext(user, "rql2-truffle")) + compilerContextCaches.getOrElseUpdate(user, createCompilerContext(user, "snapi")) } } @@ -199,19 +199,19 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte case (idn, programDecls) => val formattedDecls = programDecls.map { case TreeDeclDescription(None, outType, comment) => - DeclDescription(None, rql2TypeToRawType(outType), comment) + DeclDescription(None, snapiTypeToRawType(outType), comment) case TreeDeclDescription(Some(params), outType, comment) => val formattedParams = params.map { case TreeParamDescription(idn, tipe, required) => - ParamDescription(idn, rql2TypeToRawType(tipe), defaultValue = None, comment = None, required) + ParamDescription(idn, snapiTypeToRawType(tipe), defaultValue = None, comment = None, required) } - DeclDescription(Some(formattedParams), rql2TypeToRawType(outType), comment) + DeclDescription(Some(formattedParams), snapiTypeToRawType(outType), comment) } (idn, formattedDecls) } val programDescription = ProgramDescription( formattedDecls, - maybeType.map(t => DeclDescription(None, rql2TypeToRawType(t), None)), + maybeType.map(t => DeclDescription(None, snapiTypeToRawType(t), None)), comment ) GetProgramDescriptionSuccess(programDescription) @@ -233,19 +233,19 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte maxRows: Option[Long] ): ExecutionResponse = { val ctx = buildTruffleContext(environment, maybeOutputStream = Some(outputStream)) - ctx.initialize("rql") + ctx.initialize("snapi") ctx.enter() try { val (v, tipe) = maybeDecl match { case Some(decl) => // Eval the code and extract the function referred to by 'decl' val truffleSource = Source - .newBuilder("rql", source, "unnamed") + .newBuilder("snapi", source, "unnamed") .cached(false) // Disable code caching because of the inferrer. .build() ctx.eval(truffleSource) // 'decl' is found in the context bindings (by its name) - val bindings = ctx.getBindings("rql") + val bindings = ctx.getBindings("snapi") val f = bindings.getMember(decl) // its type is found in the polyglot bindings as '@type:' val funType = { @@ -289,7 +289,7 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte (result, tipe) case None => val truffleSource = Source - .newBuilder("rql", source, "unnamed") + .newBuilder("snapi", source, "unnamed") .cached(false) // Disable code caching because of the inferrer. .build() val result = ctx.eval(truffleSource) @@ -311,9 +311,9 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte case _ => false } val lineSeparator = if (windowsLineEnding) "\r\n" else "\n" - val w = new Rql2CsvWriter(outputStream, lineSeparator, maxRows) + val w = new SnapiCsvWriter(outputStream, lineSeparator, maxRows) try { - w.write(v, tipe.asInstanceOf[Rql2TypeWithProperties]) + w.write(v, tipe.asInstanceOf[SnapiTypeWithProperties]) w.flush() ExecutionSuccess(w.complete) } catch { @@ -325,9 +325,9 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte if (!JsonPackage.outputWriteSupport(tipe)) { return ExecutionRuntimeFailure("unsupported type") } - val w = new Rql2JsonWriter(outputStream, maxRows) + val w = new SnapiJsonWriter(outputStream, maxRows) try { - w.write(v, tipe.asInstanceOf[Rql2TypeWithProperties]) + w.write(v, tipe.asInstanceOf[SnapiTypeWithProperties]) w.flush() ExecutionSuccess(w.complete) } catch { @@ -663,7 +663,7 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte s"""let x: interval = Interval.Build(years=$years, months=$months, weeks=$weeks, days=$days, hours=$hours, minutes=$minutes, seconds=$seconds, millis=$millis) in x""" case _ => throw new CompilerServiceException("type not supported") } - val value = ctx.eval("rql", code) + val value = ctx.eval("snapi", code) ctx.asValue(value) } @@ -673,15 +673,15 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte ): Context = { // Add environment settings as hardcoded environment variables. val ctxBuilder = Context - .newBuilder("rql") + .newBuilder("snapi") .engine(engine) .environment("RAW_PROGRAM_ENVIRONMENT", ProgramEnvironment.serializeToString(environment)) .allowExperimentalOptions(true) .allowPolyglotAccess(PolyglotAccess.ALL) environment.options.get("staged-compiler").foreach { stagedCompiler => - ctxBuilder.option("rql.staged-compiler", stagedCompiler) + ctxBuilder.option("snapi.staged-compiler", stagedCompiler) } - ctxBuilder.option("rql.settings", settings.renderAsString) + ctxBuilder.option("snapi.settings", settings.renderAsString) // If the jars path is defined, create a custom class loader and set it as the host class loader. maybeTruffleClassLoader.map { classLoader => // Set the module class loader as the Truffle runtime classloader. @@ -699,7 +699,7 @@ class Rql2CompilerService(engineDefinition: (Engine, Boolean))(implicit protecte f: Context => T ): T = { val ctx = buildTruffleContext(environment) - ctx.initialize("rql") + ctx.initialize("snapi") ctx.enter() try { f(ctx) diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceBuilder.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/SnapiCompilerServiceBuilder.scala similarity index 79% rename from snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceBuilder.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/SnapiCompilerServiceBuilder.scala index 023db8cdc..3c9e13e03 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceBuilder.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/SnapiCompilerServiceBuilder.scala @@ -16,10 +16,10 @@ import com.rawlabs.compiler.CompilerServiceBuilder import com.rawlabs.compiler.CompilerService import com.rawlabs.utils.core.RawSettings -class Rql2CompilerServiceBuilder extends CompilerServiceBuilder { - override def language: Set[String] = Rql2CompilerService.LANGUAGE +class SnapiCompilerServiceBuilder extends CompilerServiceBuilder { + override def language: Set[String] = SnapiCompilerService.LANGUAGE override def build()(implicit settings: RawSettings): CompilerService = { - new Rql2CompilerService + new SnapiCompilerService } } diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/SnapiCsvWriter.scala similarity index 77% rename from snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/SnapiCsvWriter.scala index 9535be11c..3e56960fe 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2CsvWriter.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/SnapiCsvWriter.scala @@ -16,7 +16,7 @@ import com.fasterxml.jackson.core.{JsonEncoding, JsonParser} import com.fasterxml.jackson.dataformat.csv.CsvGenerator.Feature.STRICT_CHECK_FOR_QUOTING import com.fasterxml.jackson.dataformat.csv.{CsvFactory, CsvSchema} import com.rawlabs.compiler.utils.RecordFieldsNaming -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import org.graalvm.polyglot.Value import java.io.{Closeable, IOException, OutputStream} @@ -25,7 +25,7 @@ import java.util.Base64 import scala.annotation.tailrec import scala.util.control.NonFatal -final class Rql2CsvWriter(os: OutputStream, lineSeparator: String, maxRows: Option[Long]) extends Closeable { +final class SnapiCsvWriter(os: OutputStream, lineSeparator: String, maxRows: Option[Long]) extends Closeable { final private val gen = try { @@ -48,30 +48,30 @@ final class Rql2CsvWriter(os: OutputStream, lineSeparator: String, maxRows: Opti final private val timeFormatterNoMs = DateTimeFormatter.ofPattern("HH:mm:ss") final private val timestampFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS") final private val timestampFormatterNoMs = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss") - final private val tryable = Rql2IsTryableTypeProperty() - final private val nullable = Rql2IsNullableTypeProperty() + final private val tryable = SnapiIsTryableTypeProperty() + final private val nullable = SnapiIsNullableTypeProperty() private var maxRowsReached = false def complete: Boolean = !maxRowsReached @throws[IOException] - def write(v: Value, t: Rql2TypeWithProperties): Unit = { + def write(v: Value, t: SnapiTypeWithProperties): Unit = { if (t.props.contains(tryable)) { if (v.isException) { v.throwException() } else { - write(v, t.cloneAndRemoveProp(tryable).asInstanceOf[Rql2TypeWithProperties]) + write(v, t.cloneAndRemoveProp(tryable).asInstanceOf[SnapiTypeWithProperties]) } } else if (t.props.contains(nullable)) { if (v.isNull) { gen.writeString("") } else { - write(v, t.cloneAndRemoveProp(nullable).asInstanceOf[Rql2TypeWithProperties]) + write(v, t.cloneAndRemoveProp(nullable).asInstanceOf[SnapiTypeWithProperties]) } } else { t match { - case Rql2IterableType(recordType: Rql2RecordType, _) => + case SnapiIterableType(recordType: SnapiRecordType, _) => val columnNames = recordType.atts.map(_.idn) for (colName <- columnNames) { schemaBuilder.addColumn(colName) @@ -89,7 +89,7 @@ final class Rql2CsvWriter(os: OutputStream, lineSeparator: String, maxRows: Opti rowsWritten += 1 } } - case Rql2ListType(recordType: Rql2RecordType, _) => + case SnapiListType(recordType: SnapiRecordType, _) => val columnNames = recordType.atts.map(_.idn) for (colName <- columnNames) { schemaBuilder.addColumn(colName) @@ -108,7 +108,7 @@ final class Rql2CsvWriter(os: OutputStream, lineSeparator: String, maxRows: Opti } } - private def writeColumns(value: Value, recordType: Rql2RecordType): Unit = { + private def writeColumns(value: Value, recordType: SnapiRecordType): Unit = { val keys = new java.util.Vector[String] recordType.atts.foreach(a => keys.add(a.idn)) val distincted = RecordFieldsNaming.makeDistinct(keys) @@ -117,14 +117,14 @@ final class Rql2CsvWriter(os: OutputStream, lineSeparator: String, maxRows: Opti val field: String = distincted.get(i) val v = value.getMember(field) gen.writeFieldName(field) - writeValue(v, recordType.atts(i).tipe.asInstanceOf[Rql2TypeWithProperties]) + writeValue(v, recordType.atts(i).tipe.asInstanceOf[SnapiTypeWithProperties]) } gen.writeEndObject() } @throws[IOException] @tailrec - private def writeValue(v: Value, t: Rql2TypeWithProperties): Unit = { + private def writeValue(v: Value, t: SnapiTypeWithProperties): Unit = { if (t.props.contains(tryable)) { if (v.isException) { try { @@ -132,39 +132,39 @@ final class Rql2CsvWriter(os: OutputStream, lineSeparator: String, maxRows: Opti } catch { case NonFatal(ex) => gen.writeString(ex.getMessage) } - } else writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[Rql2TypeWithProperties]) + } else writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[SnapiTypeWithProperties]) } else if (t.props.contains(nullable)) { if (v.isNull) gen.writeNull() - else writeValue(v, t.cloneAndRemoveProp(nullable).asInstanceOf[Rql2TypeWithProperties]) + else writeValue(v, t.cloneAndRemoveProp(nullable).asInstanceOf[SnapiTypeWithProperties]) } else t match { - case _: Rql2BinaryType => + case _: SnapiBinaryType => val bytes = (0L until v.getBufferSize).map(v.readBufferByte) gen.writeString(Base64.getEncoder.encodeToString(bytes.toArray)) - case _: Rql2BoolType => gen.writeBoolean(v.asBoolean()) - case _: Rql2ByteType => gen.writeNumber(v.asByte().toInt) - case _: Rql2ShortType => gen.writeNumber(v.asShort().toInt) - case _: Rql2IntType => gen.writeNumber(v.asInt()) - case _: Rql2LongType => gen.writeNumber(v.asLong()) - case _: Rql2FloatType => gen.writeNumber(v.asFloat()) - case _: Rql2DoubleType => gen.writeNumber(v.asDouble()) - case _: Rql2DecimalType => gen.writeNumber(v.asString()) - case _: Rql2StringType => gen.writeString(v.asString()) - case _: Rql2DateType => + case _: SnapiBoolType => gen.writeBoolean(v.asBoolean()) + case _: SnapiByteType => gen.writeNumber(v.asByte().toInt) + case _: SnapiShortType => gen.writeNumber(v.asShort().toInt) + case _: SnapiIntType => gen.writeNumber(v.asInt()) + case _: SnapiLongType => gen.writeNumber(v.asLong()) + case _: SnapiFloatType => gen.writeNumber(v.asFloat()) + case _: SnapiDoubleType => gen.writeNumber(v.asDouble()) + case _: SnapiDecimalType => gen.writeNumber(v.asString()) + case _: SnapiStringType => gen.writeString(v.asString()) + case _: SnapiDateType => val date = v.asDate() gen.writeString(dateFormatter.format(date)) - case _: Rql2TimeType => + case _: SnapiTimeType => val time = v.asTime() val formatter = if (time.getNano > 0) timeFormatter else timeFormatterNoMs val formatted = formatter.format(time) gen.writeString(formatted) - case _: Rql2TimestampType => + case _: SnapiTimestampType => val date = v.asDate() val time = v.asTime() val dateTime = date.atTime(time) val formatter = if (time.getNano > 0) timestampFormatter else timestampFormatterNoMs val formatted = formatter.format(dateTime) gen.writeString(formatted) - case _: Rql2IntervalType => + case _: SnapiIntervalType => val duration = v.asDuration() val days = duration.toDays val hours = duration.toHoursPart diff --git a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/SnapiJsonWriter.scala similarity index 66% rename from snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala rename to snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/SnapiJsonWriter.scala index 563852cbb..6c11407d4 100644 --- a/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/Rql2JsonWriter.scala +++ b/snapi-compiler/src/main/scala/com/rawlabs/snapi/compiler/writers/SnapiJsonWriter.scala @@ -14,8 +14,8 @@ package com.rawlabs.snapi.compiler.writers import com.fasterxml.jackson.core.{JsonEncoding, JsonFactory, JsonParser} import com.rawlabs.compiler.utils.RecordFieldsNaming -import com.rawlabs.snapi.frontend.rql2.Rql2TypeUtils -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.SnapiTypeUtils +import com.rawlabs.snapi.frontend.snapi.source._ import org.graalvm.polyglot.Value import java.io.{Closeable, IOException, OutputStream} @@ -23,7 +23,7 @@ import java.time.format.DateTimeFormatter import java.util.Base64 import scala.util.control.NonFatal -final class Rql2JsonWriter(os: OutputStream, maxRows: Option[Long]) extends Closeable { +final class SnapiJsonWriter(os: OutputStream, maxRows: Option[Long]) extends Closeable { final private val gen = try { @@ -37,27 +37,27 @@ final class Rql2JsonWriter(os: OutputStream, maxRows: Option[Long]) extends Clos final private val dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd") final private val timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss.SSS") final private val timestampFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS") - final private val tryable = Rql2IsTryableTypeProperty() - final private val nullable = Rql2IsNullableTypeProperty() + final private val tryable = SnapiIsTryableTypeProperty() + final private val nullable = SnapiIsNullableTypeProperty() private var maxRowsReached = false def complete: Boolean = !maxRowsReached - def write(v: Value, t: Rql2TypeWithProperties): Unit = { + def write(v: Value, t: SnapiTypeWithProperties): Unit = { if (t.props.contains(tryable)) { if (v.isException) { v.throwException() } else { - writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[Rql2TypeWithProperties], maxRows) + writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[SnapiTypeWithProperties], maxRows) } } else { - writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[Rql2TypeWithProperties], maxRows) + writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[SnapiTypeWithProperties], maxRows) } } @throws[IOException] - private def writeValue(v: Value, t: Rql2TypeWithProperties, maxRows: Option[Long]): Unit = { + private def writeValue(v: Value, t: SnapiTypeWithProperties, maxRows: Option[Long]): Unit = { if (t.props.contains(tryable)) { if (v.isException) { try { @@ -65,38 +65,38 @@ final class Rql2JsonWriter(os: OutputStream, maxRows: Option[Long]) extends Clos } catch { case NonFatal(ex) => gen.writeString(ex.getMessage) } - } else writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[Rql2TypeWithProperties], maxRows = maxRows) + } else writeValue(v, t.cloneAndRemoveProp(tryable).asInstanceOf[SnapiTypeWithProperties], maxRows = maxRows) } else if (t.props.contains(nullable)) { if (v.isNull) gen.writeNull() - else writeValue(v, t.cloneAndRemoveProp(nullable).asInstanceOf[Rql2TypeWithProperties], maxRows = maxRows) + else writeValue(v, t.cloneAndRemoveProp(nullable).asInstanceOf[SnapiTypeWithProperties], maxRows = maxRows) } else { t match { - case _: Rql2BinaryType => + case _: SnapiBinaryType => val bytes = (0L until v.getBufferSize).map(v.readBufferByte) gen.writeString(Base64.getEncoder.encodeToString(bytes.toArray)) - case _: Rql2BoolType => gen.writeBoolean(v.asBoolean()) - case _: Rql2ByteType => gen.writeNumber(v.asByte().toInt) - case _: Rql2ShortType => gen.writeNumber(v.asShort().toInt) - case _: Rql2IntType => gen.writeNumber(v.asInt()) - case _: Rql2LongType => gen.writeNumber(v.asLong()) - case _: Rql2FloatType => gen.writeNumber(v.asFloat()) - case _: Rql2DoubleType => gen.writeNumber(v.asDouble()) - case _: Rql2DecimalType => gen.writeNumber(v.asString()) - case _: Rql2StringType => gen.writeString(v.asString()) - case _: Rql2DateType => + case _: SnapiBoolType => gen.writeBoolean(v.asBoolean()) + case _: SnapiByteType => gen.writeNumber(v.asByte().toInt) + case _: SnapiShortType => gen.writeNumber(v.asShort().toInt) + case _: SnapiIntType => gen.writeNumber(v.asInt()) + case _: SnapiLongType => gen.writeNumber(v.asLong()) + case _: SnapiFloatType => gen.writeNumber(v.asFloat()) + case _: SnapiDoubleType => gen.writeNumber(v.asDouble()) + case _: SnapiDecimalType => gen.writeNumber(v.asString()) + case _: SnapiStringType => gen.writeString(v.asString()) + case _: SnapiDateType => val date = v.asDate() gen.writeString(dateFormatter.format(date)) - case _: Rql2TimeType => + case _: SnapiTimeType => val time = v.asTime() val formatted = timeFormatter.format(time) gen.writeString(formatted) - case _: Rql2TimestampType => + case _: SnapiTimestampType => val date = v.asDate() val time = v.asTime() val dateTime = date.atTime(time) val formatted = timestampFormatter.format(dateTime) gen.writeString(formatted) - case _: Rql2IntervalType => + case _: SnapiIntervalType => val duration = v.asDuration() val days = duration.toDays val hours = duration.toHoursPart @@ -108,7 +108,7 @@ final class Rql2JsonWriter(os: OutputStream, maxRows: Option[Long]) extends Clos if (minutes > 0) s.append(s"$minutes minutes, ") s.append(s"$seconds seconds") gen.writeString(s.toString()) - case Rql2RecordType(atts, _) => + case SnapiRecordType(atts, _) => gen.writeStartObject() val keys = new java.util.Vector[String] atts.foreach(a => keys.add(a.idn)) @@ -117,10 +117,10 @@ final class Rql2JsonWriter(os: OutputStream, maxRows: Option[Long]) extends Clos val field = distincted.get(i) gen.writeFieldName(field) val a = v.getMember(field) - writeValue(a, atts(i).tipe.asInstanceOf[Rql2TypeWithProperties], maxRows = None) + writeValue(a, atts(i).tipe.asInstanceOf[SnapiTypeWithProperties], maxRows = None) } gen.writeEndObject() - case Rql2IterableType(innerType, _) => + case SnapiIterableType(innerType, _) => var rowsWritten = 0L val iterator = v.getIterator gen.writeStartArray() @@ -129,30 +129,30 @@ final class Rql2JsonWriter(os: OutputStream, maxRows: Option[Long]) extends Clos maxRowsReached = true } else { val next = iterator.getIteratorNextElement - writeValue(next, innerType.asInstanceOf[Rql2TypeWithProperties], maxRows = None) + writeValue(next, innerType.asInstanceOf[SnapiTypeWithProperties], maxRows = None) rowsWritten += 1 } } gen.writeEndArray() - case Rql2ListType(innerType, _) => + case SnapiListType(innerType, _) => val size = v.getArraySize gen.writeStartArray() for (i <- 0L until Math.min(size, maxRows.getOrElse(Long.MaxValue))) { val next = v.getArrayElement(i) - writeValue(next, innerType.asInstanceOf[Rql2TypeWithProperties], maxRows = None) + writeValue(next, innerType.asInstanceOf[SnapiTypeWithProperties], maxRows = None) } gen.writeEndArray() // Check if maxRows is reached. maxRows.foreach(max => maxRowsReached = size > max) - case Rql2OrType(tipes, _) if tipes.exists(Rql2TypeUtils.getProps(_).nonEmpty) => + case SnapiOrType(tipes, _) if tipes.exists(SnapiTypeUtils.getProps(_).nonEmpty) => // A trick to make sur inner types do not have properties - val inners = tipes.map { case inner: Rql2TypeWithProperties => Rql2TypeUtils.resetProps(inner, Set.empty) } - val orProps = tipes.flatMap { case inner: Rql2TypeWithProperties => inner.props }.toSet - writeValue(v, Rql2OrType(inners, orProps), maxRows = None) - case Rql2OrType(tipes, _) => + val inners = tipes.map { case inner: SnapiTypeWithProperties => SnapiTypeUtils.resetProps(inner, Set.empty) } + val orProps = tipes.flatMap { case inner: SnapiTypeWithProperties => inner.props }.toSet + writeValue(v, SnapiOrType(inners, orProps), maxRows = None) + case SnapiOrType(tipes, _) => val index = v.invokeMember("getIndex").asInt() val actualValue = v.invokeMember("getValue") - writeValue(actualValue, tipes(index).asInstanceOf[Rql2TypeWithProperties], maxRows = None) + writeValue(actualValue, tipes(index).asInstanceOf[SnapiTypeWithProperties], maxRows = None) case _ => throw new RuntimeException("unsupported type") } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/SnapiCompilerServiceTestContext.scala similarity index 87% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/SnapiCompilerServiceTestContext.scala index 21df4c0e5..b7e6691ea 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2CompilerServiceTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/SnapiCompilerServiceTestContext.scala @@ -16,17 +16,17 @@ import com.rawlabs.compiler.CompilerServiceTestContext import com.rawlabs.utils.core.{RawTestSuite, RawUtils, SettingsTestContext} import org.graalvm.polyglot.Engine -trait Rql2CompilerServiceTestContext extends CompilerServiceTestContext { +trait SnapiCompilerServiceTestContext extends CompilerServiceTestContext { this: RawTestSuite with SettingsTestContext => - var rql2TruffleCompilerService: Rql2CompilerService = _ + var snapiTruffleCompilerService: SnapiCompilerService = _ var engine: Engine = _ override def beforeAll(): Unit = { super.beforeAll() - property("raw.compiler.impl", "rql2-truffle") + property("raw.compiler.impl", "snapi") // Create an isolated Truffle Engine val options = new java.util.HashMap[String, String]() @@ -75,14 +75,14 @@ trait Rql2CompilerServiceTestContext extends CompilerServiceTestContext { .options(options) .build() - rql2TruffleCompilerService = new Rql2CompilerService((engine, false)) - setCompilerService(rql2TruffleCompilerService) + snapiTruffleCompilerService = new SnapiCompilerService((engine, false)) + setCompilerService(snapiTruffleCompilerService) } override def afterAll(): Unit = { - if (rql2TruffleCompilerService != null) { - RawUtils.withSuppressNonFatalException(rql2TruffleCompilerService.stop()) - rql2TruffleCompilerService = null + if (snapiTruffleCompilerService != null) { + RawUtils.withSuppressNonFatalException(snapiTruffleCompilerService.stop()) + snapiTruffleCompilerService = null } if (engine != null) { RawUtils.withSuppressNonFatalException(engine.close()) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2OutputTestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/SnapiOutputTestContext.scala similarity index 76% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2OutputTestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/SnapiOutputTestContext.scala index 9d975cdd7..ae9f9216e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/Rql2OutputTestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/SnapiOutputTestContext.scala @@ -18,8 +18,8 @@ import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper} import com.fasterxml.jackson.module.scala.{ClassTagExtensions, DefaultScalaModule} import com.google.common.collect.HashMultiset import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzer -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.FrontendSyntaxAnalyzer +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.utils.core.{RawTestSuite, SettingsTestContext} import org.bitbucket.inkytonik.kiama.util.Positions @@ -28,7 +28,7 @@ import scala.collection.JavaConverters._ import scala.math.BigDecimal.RoundingMode import scala.util.control.NonFatal -trait Rql2OutputTestContext { +trait SnapiOutputTestContext { this: RawTestSuite with SettingsTestContext => def outputParser( @@ -56,15 +56,15 @@ trait Rql2OutputTestContext { def recurse(n: JsonNode, t: Type): Any = { t match { - case t: Rql2TypeWithProperties if t.props.contains(Rql2IsTryableTypeProperty()) => - if (n.isTextual && !t.isInstanceOf[Rql2DecimalType] /* */ ) n.asText() - else recurse(n, t.cloneAndRemoveProp(Rql2IsTryableTypeProperty())) - case t: Rql2TypeWithProperties if t.props.contains(Rql2IsNullableTypeProperty()) && n.isNull => null - case _: Rql2BoolType if n.isBoolean => n.asBoolean - case _: Rql2StringType if n.isTextual => n.asText - case _: Rql2ByteType | _: Rql2ShortType | _: Rql2IntType if n.canConvertToInt => n.asInt - case _: Rql2LongType if n.canConvertToLong => n.asLong - case _: Rql2FloatType | _: Rql2DoubleType => + case t: SnapiTypeWithProperties if t.props.contains(SnapiIsTryableTypeProperty()) => + if (n.isTextual && !t.isInstanceOf[SnapiDecimalType] /* */ ) n.asText() + else recurse(n, t.cloneAndRemoveProp(SnapiIsTryableTypeProperty())) + case t: SnapiTypeWithProperties if t.props.contains(SnapiIsNullableTypeProperty()) && n.isNull => null + case _: SnapiBoolType if n.isBoolean => n.asBoolean + case _: SnapiStringType if n.isTextual => n.asText + case _: SnapiByteType | _: SnapiShortType | _: SnapiIntType if n.canConvertToInt => n.asInt + case _: SnapiLongType if n.canConvertToLong => n.asLong + case _: SnapiFloatType | _: SnapiDoubleType => // TODO (msb): Validate it's the actual type complying with our format val v = { val double = n.asDouble @@ -78,7 +78,7 @@ trait Rql2OutputTestContext { } if (floatingPointAsString) v.toString else v - case _: Rql2DecimalType => + case _: SnapiDecimalType => try { val decimal = BigDecimal(n.asText()) precision match { @@ -88,19 +88,19 @@ trait Rql2OutputTestContext { } catch { case NonFatal(_) => n.asText() // in case it was tryable } - case _: Rql2DateType if n.isTextual => + case _: SnapiDateType if n.isTextual => // TODO (msb): Validate it's the actual type complying with our format n.asText - case _: Rql2TimeType if n.isTextual => + case _: SnapiTimeType if n.isTextual => // TODO (msb): Validate it's the actual type complying with our format n.asText - case _: Rql2TimestampType if n.isTextual => + case _: SnapiTimestampType if n.isTextual => // TODO (msb): Validate it's the actual type complying with our format n.asText - case _: Rql2IntervalType if n.isTextual => + case _: SnapiIntervalType if n.isTextual => // TODO (msb): Validate it's the actual type complying with our format n.asText - case _: Rql2BinaryType if n.isTextual => + case _: SnapiBinaryType if n.isTextual => // TODO (msb): Validate it's the actual type complying with our format n.asText // case OrType(tipes) => @@ -113,15 +113,15 @@ trait Rql2OutputTestContext { // } // } // throw new AssertionError("couldn't parse OrType with any parser") - case Rql2RecordType(atts, _) if n.isObject => + case SnapiRecordType(atts, _) if n.isObject => val fields = n.fields().asScala.toVector val tipes = atts.map(_.tipe) assert(fields.length == tipes.length) fields.zip(tipes).map { case (p, t) => p.getKey -> recurse(p.getValue, t) } - case _: Rql2ListType | _: Rql2IterableType if n.isArray => + case _: SnapiListType | _: SnapiIterableType if n.isArray => val inner = t match { - case Rql2ListType(inner, _) => inner - case Rql2IterableType(inner, _) => inner + case SnapiListType(inner, _) => inner + case SnapiIterableType(inner, _) => inner } if (!ordered) { @@ -131,7 +131,7 @@ trait Rql2OutputTestContext { } else { n.iterator().asScala.map(n1 => recurse(n1, inner)).toList } - case Rql2OrType(tipes, _) => tipes.foreach { t => + case SnapiOrType(tipes, _) => tipes.foreach { t => tipes.foreach { t => try { return recurse(n, t) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2TestContext.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/SnapiTestContext.scala similarity index 99% rename from snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2TestContext.scala rename to snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/SnapiTestContext.scala index e465aded5..32dc4b4d6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/Rql2TestContext.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/SnapiTestContext.scala @@ -56,7 +56,7 @@ import com.rawlabs.protocol.compiler.{ SnowflakeConfig } import com.rawlabs.utils.core._ -import com.rawlabs.snapi.compiler.Rql2OutputTestContext +import com.rawlabs.snapi.compiler.SnapiOutputTestContext import java.io.{ByteArrayOutputStream, FileWriter} import java.nio.charset.{Charset, StandardCharsets} @@ -199,14 +199,14 @@ object TestCredentials { } -trait Rql2TestContext +trait SnapiTestContext extends RawTestSuite with Matchers with SettingsTestContext with TrainingWheelsContext with CompilerServiceTestContext - with Rql2OutputTestContext - with Rql2CompilerServiceTestContext + with SnapiOutputTestContext + with SnapiCompilerServiceTestContext with LocalInferrerTestContext { private val secrets = new mutable.HashMap[String, String]() @@ -215,7 +215,7 @@ trait Rql2TestContext protected val programOptions = new mutable.HashMap[String, String]() - override def compilerService: Rql2CompilerService = super.compilerService.asInstanceOf[Rql2CompilerService] + override def compilerService: SnapiCompilerService = super.compilerService.asInstanceOf[SnapiCompilerService] def authorizedUser: RawUid = RawUid("janeUid") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala index 9d94e8e57..0746730c6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/BenchmarkTests.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.benchmark -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BenchmarkTests extends Rql2TestContext { +class BenchmarkTests extends SnapiTestContext { property("raw.training-wheels", "false") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala index 2aa48a9e5..03506c9a7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/benchmark/StressTests.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.benchmark -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class StressTests extends Rql2TestContext { +class StressTests extends SnapiTestContext { val shouldBeExecuted = false diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala index a7121b021..64da5d1f5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BinaryPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Path import java.util.Base64 -class BinaryPackageTest extends Rql2TestContext { +class BinaryPackageTest extends SnapiTestContext { // FIXME (msb): This should use cast to support string to binary and do .getBytes("utf-8") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala index 5e293144b..cd222824a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/BytePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BytePackageTest extends Rql2TestContext { +class BytePackageTest extends SnapiTestContext { test(""" Byte.From(1)""")(it => it should evaluateTo("1b")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala index 70566075d..42c7a78a0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/CsvPackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class CsvPackageTest extends Rql2TestContext { +class CsvPackageTest extends SnapiTestContext { val ttt = "\"\"\"" @@ -590,5 +590,5 @@ class CsvPackageTest extends Rql2TestContext { |{a: 1, b: 10, c: "N"} |]""".stripMargin)) - private def isTruffle = compilerService.language.contains("rql2-truffle") + private def isTruffle = compilerService.language.contains("snapi") } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala index 0de73c359..8d29db8fd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DatePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class DatePackageTest extends Rql2TestContext { +class DatePackageTest extends SnapiTestContext { test("Date.Build(2022, 1, 15)") { it => it should typeAs("date") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala index 313444a29..a73b7979b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DecimalPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class DecimalPackageTest extends Rql2TestContext { +class DecimalPackageTest extends SnapiTestContext { test("""Decimal.Round(Decimal.From("1.423"), 2)""") { it => it should evaluateTo("""1.42q""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala index 2cbb61446..50595c709 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/DoublePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class DoublePackageTest extends Rql2TestContext { +class DoublePackageTest extends SnapiTestContext { test(""" Double.From(1)""")(it => it should evaluateTo("1.0")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala index b27d66f48..a92094ae2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/EnvironmentPackageTest.scala @@ -13,11 +13,11 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.google.common.collect.HashMultiset -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import scala.collection.JavaConverters._ -class EnvironmentPackageTest extends Rql2TestContext { +class EnvironmentPackageTest extends SnapiTestContext { test("""Environment.Secret("my-typo")""")(it => it should runErrorAs("unknown secret: my-typo")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala index 055938239..a00b8c023 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ErrorPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ErrorPackageTest extends Rql2TestContext { +class ErrorPackageTest extends SnapiTestContext { test(""" Error.Build("an error")""")(it => it should runErrorAs("an error")) test(""" Error.Build("an error") == Error.Build("an error")""")(it => it should runErrorAs("an error")) test(""" Error.Build("an error") == Error.Build("another error")""")(it => it should runErrorAs("an error")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala index eb857b3ef..23cc8e050 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FloatPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class FloatPackageTest extends Rql2TestContext { +class FloatPackageTest extends SnapiTestContext { test(""" Float.From(1)""")(it => it should evaluateTo("1.0f")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala index ed25ede75..4b717d296 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/FunctionPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class FunctionPackageTest extends Rql2TestContext { +class FunctionPackageTest extends SnapiTestContext { test("""Function.InvokeAfter(() -> 1 +1, 10)""".stripMargin)(_ should evaluateTo("2")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala index 179be81d4..78761f40f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/HttpPackageTest.scala @@ -14,12 +14,12 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.sun.net.httpserver.{BasicAuthenticator, HttpExchange, HttpServer} import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.net.InetSocketAddress import scala.collection.JavaConverters._ -class HttpPackageTest extends Rql2TestContext { +class HttpPackageTest extends SnapiTestContext { val expectedUser = "user" val expectedPassword = "passwd" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala index fec46f778..fead8da42 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class IntPackageTest extends Rql2TestContext { +class IntPackageTest extends SnapiTestContext { test(""" Int.From(1)""")(it => it should evaluateTo("1")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala index 15df90470..0247b32aa 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/IntervalPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class IntervalPackageTest extends Rql2TestContext { +class IntervalPackageTest extends SnapiTestContext { test("Interval.Build(months=12) == Interval.Build(years=1)")(_ should evaluateTo("true")) test("Interval.Build(hours=24) == Interval.Build(days=1)")(_ should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala index 17a67e01a..5301e8385 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/JsonPackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class JsonPackageTest extends Rql2TestContext { +class JsonPackageTest extends SnapiTestContext { private val junkAfter10Items = tempFile("""[ | {"a": 1, "b": "#1", "c": 1.1}, @@ -711,6 +711,6 @@ class JsonPackageTest extends Rql2TestContext { test("""Json.Parse("[10, 9, 8]", type string)""")(_ should runErrorAs("unexpected token: START_ARRAY")) test("""Json.Parse("{\"a\": 12}", type string)""")(_ should runErrorAs("unexpected token: START_OBJECT")) - private def isTruffle = compilerService.language.contains("rql2-truffle") + private def isTruffle = compilerService.language.contains("snapi") } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala index 24c146e0b..1cb4f420f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LocationPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import java.nio.file.Path -class LocationPackageTest extends Rql2TestContext with LocalLocationsTestContext { +class LocationPackageTest extends SnapiTestContext with LocalLocationsTestContext { test(s""" |let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala index 9aab40266..d7ce7f7c6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/LongPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LongPackageTest extends Rql2TestContext { +class LongPackageTest extends SnapiTestContext { test(""" Long.From(1)""")(it => it should evaluateTo("1L")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala index ed1420466..3f4bf5934 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/MathPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class MathPackageTest extends Rql2TestContext { +class MathPackageTest extends SnapiTestContext { // Nullable - Tryable tests test("""Math.Sin(if(true) then 3.13 else null)""")(_ should beCloseTo("0.011592393936158275")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala index e2a08e94e..336a0c2a3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullablePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class NullablePackageTest extends Rql2TestContext { +class NullablePackageTest extends SnapiTestContext { test("""Nullable.IsNull(null)""")(_ should evaluateTo("true")) test("""Nullable.IsNull(1)""")(_ should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala index ac581a45c..29d9dcb56 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/NullableTryablePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class NullableTryablePackageTest extends Rql2TestContext { +class NullableTryablePackageTest extends SnapiTestContext { test("""1 / null""")(_ should evaluateTo("null")) test(""" 1.0 / (if true then null else 2)""")(_ should evaluateTo("null")) test(""" 1.0 / (if false then null else 2)""")(_ should evaluateTo("0.5")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala index 4cc1ff7c9..a610992c3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RecordPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RecordPackageTest extends Rql2TestContext { +class RecordPackageTest extends SnapiTestContext { test("""Record.Build(a = 1, b = "Hello")""".stripMargin)(_ should (typeAs("record(a: int, b: string)") and run)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala index bf8c7eb80..b8f646cee 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/RegexPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RegexPackageTest extends Rql2TestContext { +class RegexPackageTest extends SnapiTestContext { test("""Regex.Replace("Heelloo John", "[aeiou]+", "_")""")(it => it should evaluateTo(""" "H_ll_ J_hn" """)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala index 88a97b7fc..72af42dbd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/S3PackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class S3PackageTest extends Rql2TestContext { +class S3PackageTest extends SnapiTestContext { import com.rawlabs.snapi.compiler.tests.TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala index 33b6561c1..a6b3cecb8 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/ShortPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ShortPackageTest extends Rql2TestContext { +class ShortPackageTest extends SnapiTestContext { test(""" Short.From(1)""")(it => it should evaluateTo("1s")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala index 1a5ed0ed4..fb5154a24 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/StringPackageTest.scala @@ -13,13 +13,13 @@ package com.rawlabs.snapi.compiler.tests.builtin import java.util.Base64 -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.snapi._ import com.rawlabs.snapi.compiler.tests.FailAfterNServer -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Path -class StringPackageTest extends Rql2TestContext with FailAfterNServer { +class StringPackageTest extends SnapiTestContext with FailAfterNServer { // Each line has 11 bytes so it will fail at line 10 more or less. override def failServices: Seq[FailAfter] = Seq( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala index 9b32affc8..791b59730 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/SuccessPackageTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.builtin import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class SuccessPackageTest extends Rql2TestContext with TableDrivenPropertyChecks { +class SuccessPackageTest extends SnapiTestContext with TableDrivenPropertyChecks { test("Success.Build(1)")(_ should evaluateTo("1")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala index 8d31f0842..ff528f2f4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimePackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class TimePackageTest extends Rql2TestContext { +class TimePackageTest extends SnapiTestContext { test("Time.Build(9, 30)") { it => it should typeAs("time") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala index a08c065a3..897b0e540 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TimestampPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class TimestampPackageTest extends Rql2TestContext { +class TimestampPackageTest extends SnapiTestContext { test("Timestamp.Build(2022, 1, 15, 9, 30)") { it => it should typeAs("timestamp") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala index 222cfd330..a96130125 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TryPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class TryPackageTest extends Rql2TestContext { +class TryPackageTest extends SnapiTestContext { test("""Try.IsError("hi")""")(_ should evaluateTo("false")) test("""Try.IsError(1)""")(_ should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala index 2d9c1cbd7..c0a177f2e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/TypePackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class TypePackageTest extends Rql2TestContext { +class TypePackageTest extends SnapiTestContext { ignore("""Types.Merge(int, float)""")(it => it should typeAs("float")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala index 45c2a9dfd..9954c5490 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/XmlPackageTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class XmlPackageTest extends Rql2TestContext { +class XmlPackageTest extends SnapiTestContext { private val allTypes = tempFile(""" | 120 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala index 63c80b37a..839139666 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionDistinctTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class CollectionDistinctTest extends Rql2TestContext { +class CollectionDistinctTest extends SnapiTestContext { test("""let numbers = Collection.From([5, 2, 4, 2, 2, 4, 5]) |in Collection.Distinct(numbers)""".stripMargin)(_ should evaluateTo("[2, 4, 5]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala index f129eb9ee..0496eab47 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionExplodeTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionExplodeTest extends Rql2TestContext with LocalLocationsTestContext { +class CollectionExplodeTest extends SnapiTestContext with LocalLocationsTestContext { private val nba = tempFile("""[ | {"team": {"name": "Bulls", "city": "Chicago"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala index 466f168bd..a58b84db7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionGroupByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionGroupByTest extends Rql2TestContext with LocalLocationsTestContext { +class CollectionGroupByTest extends SnapiTestContext with LocalLocationsTestContext { private val lineitemType = """record( | l_orderkey: int, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala index 3bad916f4..ce67aed4c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionJoinTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionJoinTest extends Rql2TestContext with LocalLocationsTestContext { +class CollectionJoinTest extends SnapiTestContext with LocalLocationsTestContext { test(snapi"""let regions = Csv.InferAndRead("$tpchRegionCsvLocal"), | nations = Csv.InferAndRead("$tpchNationCsvLocal") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala index b8992c0ac..ed81ae7fe 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMinMaxTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class CollectionMinMaxTest extends Rql2TestContext { +class CollectionMinMaxTest extends SnapiTestContext { // Date test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala index 11e40ba89..ceccfb017 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionMkStringTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class CollectionMkStringTest extends Rql2TestContext { +class CollectionMkStringTest extends SnapiTestContext { test("""let items = Collection.Build() |in Collection.MkString(items, sep="|")""".stripMargin)(_ should evaluateTo(""" "" """)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala index 74dc3aa0d..be6148804 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionOrderByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.{InvalidOrderSpec, KeyNotComparable, OrderSpecMustFollowOrderingFunction} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.{InvalidOrderSpec, KeyNotComparable, OrderSpecMustFollowOrderingFunction} +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionOrderByTest extends Rql2TestContext with LocalLocationsTestContext { +class CollectionOrderByTest extends SnapiTestContext with LocalLocationsTestContext { private val coolBandsWithoutHeader = tempFile("""Bee Gees|Maurice|Gibb|1949 |Bee Gees|Robin|Gibb|1949 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala index 9d428cbcb..10709b45f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Path -class CollectionPackageTest extends Rql2TestContext { +class CollectionPackageTest extends SnapiTestContext { // a test to check if there are multiple instances of generators test("""let a = Collection.Build(1,2,3), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala index 43be5804e..354ac28d4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionRangeTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class CollectionRangeTest extends Rql2TestContext { +class CollectionRangeTest extends SnapiTestContext { // Long.Range diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala index 65877eb7a..9fb18e8c5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/collection/CollectionUnionTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.collection -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class CollectionUnionTest extends Rql2TestContext with LocalLocationsTestContext { +class CollectionUnionTest extends SnapiTestContext with LocalLocationsTestContext { test("Collection.Union(Collection.Build(1,2,3), Collection.Build(4,5,6))")(_ should evaluateTo("[1,2,3,4,5,6]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala index 5a3bc6950..9d0ec4277 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/AwsPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class AwsPackageTest extends Rql2TestContext { +class AwsPackageTest extends SnapiTestContext { val accessKeyId = sys.env("RAW_AWS_ACCESS_KEY_ID") val secretAccessKey = sys.env("RAW_AWS_SECRET_ACCESS_KEY") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala index bef9a0360..f528f9815 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/EnvironmentPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class EnvironmentPackageTest extends Rql2TestContext { +class EnvironmentPackageTest extends SnapiTestContext { secret("my-secret", "my-secret-value") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala index 995dfb367..e87f318ba 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/LocationPackageTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LocationPackageTest extends Rql2TestContext { +class LocationPackageTest extends SnapiTestContext { import com.rawlabs.snapi.compiler.tests.TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala index a4965f877..46c204df9 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/MySQLPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class MySQLPackageTest extends Rql2TestContext { +class MySQLPackageTest extends SnapiTestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala index 13a17baa9..35b9204b2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/OraclePackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class OraclePackageTest extends Rql2TestContext { +class OraclePackageTest extends SnapiTestContext { import TestCredentials._ @@ -26,7 +26,7 @@ class OraclePackageTest extends Rql2TestContext { rdbms("oracle", oracleCreds) test(s"""Oracle.InferAndRead("oracle", "$oracleSchema", "$oracleTable")""") { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should evaluateTo( """[ | {A: 1, B: 1, C: Decimal.From(1.5), D: Decimal.From(1.5), X: "x1", Y: "y1"}, @@ -41,7 +41,7 @@ class OraclePackageTest extends Rql2TestContext { | type collection(record(A: int, B: int, C: double, D: double, X: string, Y: string)) |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should evaluateTo( """[ | {A: 1, B: 1, C: 1.5, D: 1.5, X: "x1", Y: "y1"}, @@ -55,7 +55,7 @@ class OraclePackageTest extends Rql2TestContext { s"""Oracle.Read("oracle", "$oracleSchema", "$oracleTable", | type collection(record(A: int, B: int, C: double, D: double, X: int, Y: string)))""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should orderEvaluateTo( """[ | {A: 1, B: 1, C: 1.5, D: 1.5, X: Error.Build("failed to read value: column 'X': Fail to convert to internal representation"), Y: "y1"}, @@ -69,7 +69,7 @@ class OraclePackageTest extends Rql2TestContext { s"""Oracle.InferAndRead("$oracleDb", "$oracleSchema", "$oracleTable", | host = "${oracleCreds.getHost}", username = "${oracleCreds.getUser}", password = "${oracleCreds.getPassword}")""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should evaluateTo( """[ | {A: 1, B: 1, C: Decimal.From(1.5), D: Decimal.From(1.5), X: "x1", Y: "y1"}, @@ -84,7 +84,7 @@ class OraclePackageTest extends Rql2TestContext { | type collection(record(A: int, B: int, C: double, D: double, X: int, Y: string)), | host = "${oracleCreds.getHost}", username = "${oracleCreds.getUser}", password = "${oracleCreds.getPassword}" )""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should orderEvaluateTo( """[ | {A: 1, B: 1, C: 1.5, D: 1.5, X: Error.Build("failed to read value: column 'X': Fail to convert to internal representation"), Y: "y1"}, @@ -123,7 +123,7 @@ class OraclePackageTest extends Rql2TestContext { | type collection(record(A: int, B: int, C: double, D: double, X: int, Y: string)) |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should runErrorAs(s"""o credential found for oracle: $oracleSchema""".stripMargin) } @@ -135,7 +135,7 @@ class OraclePackageTest extends Rql2TestContext { | host = "oracle.localdomain", username = "${oracleCreds.getUser}", password = "${oracleCreds.getPassword}" |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should runErrorAs("""unknown host: oracle.localdomain""".stripMargin) } @@ -147,7 +147,7 @@ class OraclePackageTest extends Rql2TestContext { | host = "localhost", username = "${oracleCreds.getUser}", password = "${oracleCreds.getPassword}" |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should runErrorAs("error connecting to database: localhost") } @@ -160,7 +160,7 @@ class OraclePackageTest extends Rql2TestContext { | host = "test-oracle.raw-labs.com", username = "${oracleCreds.getUser}", password = "${oracleCreds.getPassword}", port = 1234 |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should runErrorAs("""connect timed out: test-oracle.raw-labs.com""".stripMargin) } @@ -172,7 +172,7 @@ class OraclePackageTest extends Rql2TestContext { | host = "test-oracle.raw-labs.com" |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should runErrorAs("""username is required""".stripMargin) } @@ -184,7 +184,7 @@ class OraclePackageTest extends Rql2TestContext { | host = "test-oracle.raw-labs.com", username = "${oracleCreds.getUser}", password = "wrong!" |)""".stripMargin ) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should runErrorAs("""authentication failed""".stripMargin) } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala index 42dbe6919..35900c126 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/PostgreSQLPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class PostgreSQLPackageTest extends Rql2TestContext { +class PostgreSQLPackageTest extends SnapiTestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala index ae3159e8b..a5b2febca 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/S3PackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class S3PackageTest extends Rql2TestContext { +class S3PackageTest extends SnapiTestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala index 420517148..4abfef216 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SQLServerPackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class SQLServerPackageTest extends Rql2TestContext { +class SQLServerPackageTest extends SnapiTestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala index b811db0db..cd74fff56 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/credentials/SnowflakePackageTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class SnowflakePackageTest extends Rql2TestContext { +class SnowflakePackageTest extends SnapiTestContext { import TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala index 227dc5fb9..14d981a4c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListDistinctTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ListDistinctTest extends Rql2TestContext { +class ListDistinctTest extends SnapiTestContext { test("""let numbers = [5, 2, 4, 2, 2, 4, 5] |in List.Distinct(numbers)""".stripMargin)(_ should evaluateTo("[2, 4, 5]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala index e4cdedbcd..192a2cb76 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListExplodeTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListExplodeTest extends Rql2TestContext with LocalLocationsTestContext { +class ListExplodeTest extends SnapiTestContext with LocalLocationsTestContext { private val nba = tempFile("""[ | {"team": {"name": "Bulls", "city": "Chicago"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala index 0ae654283..64db22baf 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListGroupByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListGroupByTest extends Rql2TestContext with LocalLocationsTestContext { +class ListGroupByTest extends SnapiTestContext with LocalLocationsTestContext { private val lineitemType = """record( | l_orderkey: int, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala index 0988d6295..d66e02905 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListJoinTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.KeyNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.KeyNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListJoinTest extends Rql2TestContext with LocalLocationsTestContext { +class ListJoinTest extends SnapiTestContext with LocalLocationsTestContext { private val listOfCountries = """[ | {region: "AFRICA", nation: "ALGERIA"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala index c1c3e1ed0..247aa6ef1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMinMaxTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ListMinMaxTest extends Rql2TestContext { +class ListMinMaxTest extends SnapiTestContext { // Date test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala index 0ff1d6b25..3559624f3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListMkStringTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ListMkStringTest extends Rql2TestContext { +class ListMkStringTest extends SnapiTestContext { test("""let items = List.Build() |in List.MkString(items, sep="|")""".stripMargin)(_ should evaluateTo(""" "" """)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala index 8d4b79334..169db6d98 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListOrderByTest.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.{InvalidOrderSpec, KeyNotComparable} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.{InvalidOrderSpec, KeyNotComparable} +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListOrderByTest extends Rql2TestContext with LocalLocationsTestContext { +class ListOrderByTest extends SnapiTestContext with LocalLocationsTestContext { // using String.ReadLines test(snapi"""let regions = List.From(Collection.Transform( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala index ef205fee8..df4c89466 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListPackageTest.scala @@ -12,13 +12,13 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Path -class ListPackageTest extends Rql2TestContext { +class ListPackageTest extends SnapiTestContext { test("""["Hello", Error.Build("Argh!!"), null]""") { _ should evaluateTo("""["Hello", Error.Build("Argh!!"), null]""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala index f1fedddfc..386544fb2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/builtin/list/ListUnionTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.builtin.list -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class ListUnionTest extends Rql2TestContext with LocalLocationsTestContext { +class ListUnionTest extends SnapiTestContext with LocalLocationsTestContext { test("List.Union([1,2,3], [4,5,6])")(_ should evaluateTo("[1,2,3,4,5,6]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala index 69a6b3a2c..a8437990a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/hints/SemanticAnalyzerHintsTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.hints -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class SemanticAnalyzerHintsTest extends Rql2TestContext { +class SemanticAnalyzerHintsTest extends SnapiTestContext { test("""Rekord.Build(a=1)""")(it => it should typeErrorAs("did you mean Record.Build?")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala index 6f6140448..97d603a38 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspAiValidateTest.scala @@ -13,10 +13,10 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.ValidateResponse -import com.rawlabs.snapi.frontend.rql2.errors.OutputTypeRequiredForRecursiveFunction -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.OutputTypeRequiredForRecursiveFunction +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspAiValidateTest extends Rql2TestContext { +class LspAiValidateTest extends SnapiTestContext { test("AI validate package that does not exist") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala index d8d99468c..4f7bc3918 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspBrokenCodeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{HoverResponse, Pos, TypeCompletion} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspBrokenCodeTest extends Rql2TestContext { +class LspBrokenCodeTest extends SnapiTestContext { test("broken code hover test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala index e9d28e0b1..524cdc994 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCommentsFormatTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.FormatCodeResponse -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspCommentsFormatTest extends Rql2TestContext { +class LspCommentsFormatTest extends SnapiTestContext { def assertFormattedCode( code: String, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala index 8cfee964e..d15789aba 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspCompilationMessagesTest.scala @@ -14,8 +14,8 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{ErrorMessage, WarningMessage} import com.rawlabs.snapi.frontend.base.errors.{MissingSecretWarning, UnknownDecl} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -class LspCompilationMessagesTest extends Rql2TestContext { +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +class LspCompilationMessagesTest extends SnapiTestContext { test("should return a waning") { _ => val code = """let a = Environment.Secret("a") in a""".stripMargin diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala index 63536740b..bbb893d01 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDefinitionTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{GoToDefinitionResponse, Pos} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspDefinitionTest extends Rql2TestContext { +class LspDefinitionTest extends SnapiTestContext { test("go to definition identifier at usage test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala index fc83df065..2013a2d4a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspDotAutoCompleteTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{AutoCompleteResponse, FieldCompletion, PackageEntryCompletion, Pos} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspDotAutoCompleteTest extends Rql2TestContext { +class LspDotAutoCompleteTest extends SnapiTestContext { private def dotAutoCompleteTest(code: String, line: Int, col: Int, expectedFields: Seq[(String, String)]): Unit = { val AutoCompleteResponse(entries) = dotAutoComplete(code, Pos(line, col)) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala index e9572d1d7..6d66a90d2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspFormatCodeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.FormatCodeResponse -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspFormatCodeTest extends Rql2TestContext { +class LspFormatCodeTest extends SnapiTestContext { def assertFormattedCode(code: String, expected: String) = { val FormatCodeResponse(Some(formattedCode)) = formatCode(code) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala index ae07b4c54..d850bf2c3 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspHoverTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{HoverResponse, PackageCompletion, PackageEntryCompletion, Pos, TypeCompletion} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspHoverTest extends Rql2TestContext { +class LspHoverTest extends SnapiTestContext { test("hover identifier at definition test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala index 1e7c39473..f4bc78980 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspRenameTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.{Pos, RenameResponse} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspRenameTest extends Rql2TestContext { +class LspRenameTest extends SnapiTestContext { test("rename identifier at usage test") { _ => val code = """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala index a954c1ae0..c33f92281 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspValidateTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.lsp import com.rawlabs.compiler.ValidateResponse -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspValidateTest extends Rql2TestContext { +class LspValidateTest extends SnapiTestContext { test("validate simple code test") { _ => val code = """String.Lower("Hello")""".stripMargin diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala index d6ec94036..08c9c822a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/lsp/LspWordAutoCompleteTest.scala @@ -24,9 +24,9 @@ import com.rawlabs.compiler.{ Pos, TypeCompletion } -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LspWordAutoCompleteTest extends Rql2TestContext { +class LspWordAutoCompleteTest extends SnapiTestContext { private lazy val allTypes = Seq( ("byte", Some("")), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala index 949ed45d2..090fd38af 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/KryoPackageTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.offheap import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class KryoPackageTest extends Rql2TestContext with TableDrivenPropertyChecks { +class KryoPackageTest extends SnapiTestContext with TableDrivenPropertyChecks { private val cases = Table( ("value", "type"), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala index 3f1c5fdb3..15de9c1e5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDatasets.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -trait OffHeapDatasets { this: Rql2TestContext => +trait OffHeapDatasets { this: SnapiTestContext => protected val N = 100 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala index 8c13b3292..adbbf1997 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapDistinctTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class OffHeapDistinctTest extends Rql2TestContext { +class OffHeapDistinctTest extends SnapiTestContext { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "30kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala index 1251072af..8490ed548 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapEquiJoinTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ -class OffHeapEquiJoinTest extends Rql2TestContext with OffHeapDatasets { +class OffHeapEquiJoinTest extends SnapiTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala index 695367e70..e301ee876 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapGroupTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ -class OffHeapGroupTest extends Rql2TestContext with OffHeapDatasets { +class OffHeapGroupTest extends SnapiTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala index 960b0ed39..3564d1a1a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapJoinTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ -class OffHeapJoinTest extends Rql2TestContext with OffHeapDatasets { +class OffHeapJoinTest extends SnapiTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala index 7a22b5422..fa78818dd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/offheap/OffHeapOrderByTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.offheap -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ -class OffHeapOrderByTest extends Rql2TestContext with OffHeapDatasets { +class OffHeapOrderByTest extends SnapiTestContext with OffHeapDatasets { // This is to ensure the test triggers spill to disk. property("raw.runtime.external.disk-block-max-size", "20kB") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala index b78565041..5471a0950 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/BinaryOutputTest.scala @@ -13,13 +13,13 @@ package com.rawlabs.snapi.compiler.tests.output import org.apache.commons.io.FileUtils -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext import java.io.File import java.nio.file.Files -class BinaryOutputTest extends Rql2TestContext with LocalLocationsTestContext { +class BinaryOutputTest extends SnapiTestContext with LocalLocationsTestContext { option("output-format", "binary") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala index af72266d4..618670c72 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/CsvOutputTest.scala @@ -13,13 +13,13 @@ package com.rawlabs.snapi.compiler.tests.output import com.rawlabs.utils.core.RawUtils -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ import com.rawlabs.utils.core._ import java.nio.file.Files -class CsvOutputTest extends Rql2TestContext { +class CsvOutputTest extends SnapiTestContext { option("output-format", "csv") @@ -119,7 +119,7 @@ class CsvOutputTest extends Rql2TestContext { val path = Files.createTempFile("", "") try { it should saveToInFormat(path, "csv") - if (compilerService.language.contains("rql2-truffle")) { + if (compilerService.language.contains("snapi")) { path should contain( snapi"""byteCol,shortCol,intCol,longCol,floatCol,doubleCol,decimalCol,boolCol,nullBoolCol,dateCol,timeCol,timestampCol |"failed to parse CSV (location: $csvWithAllTypes: line 1, col 1), cannot parse 'byteCol' as a byte","failed to parse CSV (location: $csvWithAllTypes: line 1, col 9), cannot parse 'shortCol' as a short","failed to parse CSV (location: $csvWithAllTypes: line 1, col 18), cannot parse 'intCol' as an int","failed to parse CSV (location: $csvWithAllTypes: line 1, col 25), cannot parse 'longCol' as a long","failed to parse CSV (location: $csvWithAllTypes: line 1, col 33), cannot parse 'floatCol' as a float","failed to parse CSV (location: $csvWithAllTypes: line 1, col 42), cannot parse 'doubleCol' as a double","failed to parse CSV (location: $csvWithAllTypes: line 1, col 52), cannot parse 'decimalCol' as a decimal","failed to parse CSV (location: $csvWithAllTypes: line 1, col 63), cannot parse 'boolCol' as a bool","failed to parse CSV (location: $csvWithAllTypes: line 1, col 71), cannot parse 'nullBoolCol' as a bool","failed to parse CSV (location: $csvWithAllTypes: line 1, col 83), string 'dateCol' does not match date template 'yyyy-M-d'","failed to parse CSV (location: $csvWithAllTypes: line 1, col 91), string 'timeCol' does not match time template 'HH:mm[:ss[.SSS]]'","failed to parse CSV (location: $csvWithAllTypes: line 1, col 99), string 'timestampCol' does not match timestamp template 'HH:mm[:ss[.SSS]]'" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala index 40ac451e1..d3745c0c7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/JsonOutputTest.scala @@ -13,12 +13,12 @@ package com.rawlabs.snapi.compiler.tests.output import com.rawlabs.utils.core.RawUtils -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.core._ import java.nio.file.{Files, Path} -class JsonOutputTest extends Rql2TestContext { +class JsonOutputTest extends SnapiTestContext { option("output-format", "json") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala index ca356c79c..fd7ddf9f5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/output/TextOutputTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.output -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Files -class TextOutputTest extends Rql2TestContext { +class TextOutputTest extends SnapiTestContext { option("output-format", "text") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala index 6c007f4fa..c1fb000ee 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/FrontendSyntaxAnalyzerTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class FrontendSyntaxAnalyzerTest extends Rql2TestContext { +class FrontendSyntaxAnalyzerTest extends SnapiTestContext { // Internal node, not visible to the user parser. test(s"""$$package("Collection")""".stripMargin)(it => it shouldNot parse) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala index ada97ea9a..48bec4e0f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/ListSugarTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ListSugarTest extends Rql2TestContext { +class ListSugarTest extends SnapiTestContext { test("""[1,2,3]""") { it => it should typeAs("list(int)") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala index 280d74d59..48bc5e09c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/OperatorPrecedenceTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class OperatorPrecedenceTest extends Rql2TestContext { +class OperatorPrecedenceTest extends SnapiTestContext { test("""1+2*3""") { it => it should evaluateTo("(1+(2*3))") @@ -25,19 +25,19 @@ class OperatorPrecedenceTest extends Rql2TestContext { test("""false or true and true""") { it => it should astParseAs( - Rql2Program(BinaryExp(Or(), BoolConst(false), BinaryExp(And(), BoolConst(true), BoolConst(true)))) + SnapiProgram(BinaryExp(Or(), BoolConst(false), BinaryExp(And(), BoolConst(true), BoolConst(true)))) ) } test("""false and true or true""") { it => it should astParseAs( - Rql2Program(BinaryExp(Or(), BinaryExp(And(), BoolConst(false), BoolConst(true)), BoolConst(true))) + SnapiProgram(BinaryExp(Or(), BinaryExp(And(), BoolConst(false), BoolConst(true)), BoolConst(true))) ) } test("""true or false and true or true""") { it => it should astParseAs( - Rql2Program( + SnapiProgram( BinaryExp( Or(), BinaryExp(Or(), BoolConst(true), BinaryExp(And(), BoolConst(false), BoolConst(true))), @@ -47,17 +47,17 @@ class OperatorPrecedenceTest extends Rql2TestContext { ) } - test("X.a.b.c")(it => it should astParseAs(Rql2Program(Proj(Proj(Proj(IdnExp(IdnUse("X")), "a"), "b"), "c")))) + test("X.a.b.c")(it => it should astParseAs(SnapiProgram(Proj(Proj(Proj(IdnExp(IdnUse("X")), "a"), "b"), "c")))) test("x and y and z")(it => it should astParseAs( - Rql2Program(BinaryExp(And(), BinaryExp(And(), IdnExp(IdnUse("x")), IdnExp(IdnUse("y"))), IdnExp(IdnUse("z")))) + SnapiProgram(BinaryExp(And(), BinaryExp(And(), IdnExp(IdnUse("x")), IdnExp(IdnUse("y"))), IdnExp(IdnUse("z")))) ) ) test("f(1)(2)")(it => it should astParseAs( - Rql2Program( + SnapiProgram( FunApp( FunApp(IdnExp(IdnUse("f")), Vector(FunAppArg(IntConst("1"), None))), Vector(FunAppArg(IntConst("2"), None)) @@ -66,12 +66,12 @@ class OperatorPrecedenceTest extends Rql2TestContext { ) ) - test("not not true")(it => it should astParseAs(Rql2Program(UnaryExp(Not(), UnaryExp(Not(), BoolConst(true)))))) + test("not not true")(it => it should astParseAs(SnapiProgram(UnaryExp(Not(), UnaryExp(Not(), BoolConst(true)))))) test("100 / 10 * 10") { it => it should evaluateTo("(100 / 10) * 10") it should astParseAs( - Rql2Program(BinaryExp(Mult(), BinaryExp(Div(), IntConst("100"), IntConst("10")), IntConst("10"))) + SnapiProgram(BinaryExp(Mult(), BinaryExp(Div(), IntConst("100"), IntConst("10")), IntConst("10"))) ) } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala index 7beb0cb5f..9ade31190 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/parser/RecordSugarTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.parser -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RecordSugarTest extends Rql2TestContext { +class RecordSugarTest extends SnapiTestContext { test("""{a: 1, b: "2"}""") { it => it should typeAs("record(a: int, b: string)") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala index 8f2c8cefd..1851d4c45 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10194Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD10194Test extends Rql2TestContext { +class RD10194Test extends SnapiTestContext { private val q = """main(title: string = null, description: string = null, category: string = null, rating: string = null, actor: string = null) = diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala index 899b43252..81d34016d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10220Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD10220Test extends Rql2TestContext { +class RD10220Test extends SnapiTestContext { test("""Csv.InferAndParse("stringData")""")( _ should (typeAs("collection(record(stringData: undefined))") and evaluateTo("[]")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala index b4ad9433a..946d577af 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10723Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD10723Test extends Rql2TestContext { +class RD10723Test extends SnapiTestContext { private val qqq = "\"\"\"" test(s"""main() = diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala index 76dccf870..e86424abf 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10767Test.scala @@ -13,10 +13,10 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.compiler.{GetProgramDescriptionSuccess, ProgramEnvironment} -import com.rawlabs.snapi.frontend.rql2.SnapiInterpolator -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.SnapiInterpolator +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD10767Test extends Rql2TestContext { +class RD10767Test extends SnapiTestContext { private val data = tempFile(""" |[ | {"a": 1, "b": 10, "c": 100}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala index 49c6ed557..27c19488e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD10801Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2.SnapiInterpolator -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.SnapiInterpolator +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD10801Test extends Rql2TestContext { +class RD10801Test extends SnapiTestContext { private val qqq = "\"\"\"" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala index 1b807119d..fef18552b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3742Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD3742Test extends Rql2TestContext { +class RD3742Test extends SnapiTestContext { val triple = "\"\"\"" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala index c84467495..8e3855d65 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD3784Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD3784Test extends Rql2TestContext { +class RD3784Test extends SnapiTestContext { private val data = tempFile( """v diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala index e16a76ca0..dfd070d20 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4529Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD4529Test extends Rql2TestContext { +class RD4529Test extends SnapiTestContext { test(""" |let a: float = 1.0f diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala index 61849a682..7ded93e8a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD4981Test.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class RD4981Test extends Rql2TestContext with LocalLocationsTestContext { +class RD4981Test extends SnapiTestContext with LocalLocationsTestContext { test(snapi"""let | data = Csv.InferAndRead("$airportsLocal"), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala index efc82368a..f8cc86899 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5238Test.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class RD5238Test extends Rql2TestContext with LocalLocationsTestContext { +class RD5238Test extends SnapiTestContext with LocalLocationsTestContext { test(snapi""" |let region1 = Csv.InferAndRead("$tpchRegionCsvLocal"), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala index 89c2ff03c..4f1bc8af0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5365Test.scala @@ -15,11 +15,11 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData import org.bitbucket.inkytonik.kiama.util.Positions import org.scalatest.matchers.{MatchResult, Matcher} -import com.rawlabs.snapi.frontend.rql2.FrontendSyntaxAnalyzer -import com.rawlabs.snapi.frontend.rql2.source.SourcePrettyPrinter -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.FrontendSyntaxAnalyzer +import com.rawlabs.snapi.frontend.snapi.source.SourcePrettyPrinter +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5365Test extends Rql2TestContext { +class RD5365Test extends SnapiTestContext { private class PrettyPrintAs(expected: String) extends Matcher[TestData] { override def apply(query: TestData): MatchResult = { diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala index 7e2cafec2..14db363ca 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5393Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2.errors.CannotDetermineTypeOfParameter -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.CannotDetermineTypeOfParameter +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5393Test extends Rql2TestContext { +class RD5393Test extends SnapiTestContext { test("""main(country: string = null,code: string = null) = | let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala index 60f8ab1cc..764c73ed8 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5412Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5412Test extends Rql2TestContext { +class RD5412Test extends SnapiTestContext { test("""let | json_type = type record(creation_date: string, entries: list(string)), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala index f9e3ed9c0..5e7935cda 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5448Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5448Test extends Rql2TestContext { +class RD5448Test extends SnapiTestContext { private val ttt = "\"\"\"" private val jsonString = """[ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala index ca110c8af..145a0bf16 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5484Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5484Test extends Rql2TestContext { +class RD5484Test extends SnapiTestContext { // top-level and correct. test("""Timestamp.Build(2015, 1, 4, 22, 0)""")(_ should run) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala index bfa1c0c50..c5e2c524a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5488Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5488Test extends Rql2TestContext { +class RD5488Test extends SnapiTestContext { // All these tests are valid queries. They fail in the middle of compilation, at L0, with "lines is declared more than once". diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala index dab01bf1c..e5d1c1837 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5491Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5491Test extends Rql2TestContext { +class RD5491Test extends SnapiTestContext { test(s"""let | query = \"\"\"SELECT (?item as ?cat) ?itemLabel diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala index 5527869e7..a24cb8f6a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5644Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5644Test extends Rql2TestContext { +class RD5644Test extends SnapiTestContext { // Basic reference behavior. The function parameter isn't type and inherits the list item type. Everything matches. test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala index ed79df231..9024f6f55 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5679Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5679Test extends Rql2TestContext { +class RD5679Test extends SnapiTestContext { // regular XML file (types as record) with a list inside private val xml = tempFile(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala index 365836822..061ae29b9 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5685Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5685Test extends Rql2TestContext { +class RD5685Test extends SnapiTestContext { test("""let itemType = type int, | listType = type list(itemType), diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala index b8482079a..a737afb20 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5691Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -class RD5691Test extends Rql2TestContext with LocalLocationsTestContext { +class RD5691Test extends SnapiTestContext with LocalLocationsTestContext { test(s""" |let issueType = type record( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala index 3691282ff..2f695afc0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5697Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ -class RD5697Test extends Rql2TestContext { +class RD5697Test extends SnapiTestContext { private val jsonFile = tempFile("""{"a": 12, "b": 14}""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala index 502e77b3f..8a14ea997 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5714Test.scala @@ -13,11 +13,11 @@ package com.rawlabs.snapi.compiler.tests.regressions import java.nio.file.Files -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import scala.io.Source -class RD5714Test extends Rql2TestContext { +class RD5714Test extends SnapiTestContext { test("""let colA = [{id: 1, name: "john"}], | colB = [{id: 2, firstName: "john"}], diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala index b77726609..dcd5923c8 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5722Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5722Test extends Rql2TestContext { +class RD5722Test extends SnapiTestContext { test("""let data = Collection.Build({ | a: { b: 123} diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala index 71fd0f996..fccfe00e6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD572Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD572Test extends Rql2TestContext { +class RD572Test extends SnapiTestContext { test("-128b") { it => it should typeAs("byte") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala index 42f3413df..0f7fc29df 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5775Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5775Test extends Rql2TestContext { +class RD5775Test extends SnapiTestContext { test("""let data = Http.Get("https://jira.atlassian.com/rest/api/latest/search", args=[{"jql", "fixVersion=9.0.0"}]), | r = Json.InferAndRead(data), | issues = Collection.Transform(r.issues, i -> { diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala index e41eb4ecc..da4a1977d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5779Test.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Path -class RD5779Test extends Rql2TestContext { +class RD5779Test extends SnapiTestContext { val data: Path = tempFile("""[ | {"a": 1, "b": 10} |]""".stripMargin) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala index 036a417ac..4ff3aad8d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5784Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ -class RD5784Test extends Rql2TestContext { +class RD5784Test extends SnapiTestContext { private val xmlFile = tempFile(""" | diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala index 0b3422403..f61b079b1 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5785Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5785Test extends Rql2TestContext { +class RD5785Test extends SnapiTestContext { // The only way of this returning true is if all values in the list are the same. // Almost impossible with 5 random values. diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala index de70a0afb..426578253 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5786Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5786Test extends Rql2TestContext { +class RD5786Test extends SnapiTestContext { test("""true == false""") { _ should evaluateTo(""" false """) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala index 68b945388..9578429ce 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5851Test.scala @@ -25,9 +25,9 @@ import com.rawlabs.compiler.{ Pos, TypeCompletion } -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5851Test extends Rql2TestContext { +class RD5851Test extends SnapiTestContext { def autoCompleteNames(entries: Array[Completion]): Seq[String] = { entries.map { diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala index 1a9fbd89c..ca0bb5845 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5884Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5884Test extends Rql2TestContext { +class RD5884Test extends SnapiTestContext { test("""let f(x: int, y: int = 12) = 3.14 + x + y |in f(1)""".stripMargin)(_ should run) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala index 30562d199..2d1b909d5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5893Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5893Test extends Rql2TestContext { +class RD5893Test extends SnapiTestContext { // this has a list of text private val data = tempFile(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala index 2fb09adbb..79a1ed192 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5914Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5914Test extends Rql2TestContext { +class RD5914Test extends SnapiTestContext { test("""let item1 = {name: "coffee machine", price: 200, price: 199}, // price is duplicated, price is an int | item2 = {name: "coffee machine", price: 200.00, price: 199.99} // price is duplicated, price is a double diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala index 7c8a6e14e..f44f8f180 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5920Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5920Test extends Rql2TestContext { +class RD5920Test extends SnapiTestContext { test("""let f(x: int) = x * 10 |in f(10)""".stripMargin)(_ should evaluateTo("100")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala index c8cfc5cf5..1ca4ad762 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5921Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5921Test extends Rql2TestContext { +class RD5921Test extends SnapiTestContext { val data1 = tempFile("""1 |2 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala index f7574e957..8d54e3c5c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5925Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5925Test extends Rql2TestContext { +class RD5925Test extends SnapiTestContext { test("""let c = Collection.Build(1, 2, 3, 4) |in Collection.Filter(c, s -> null)""".stripMargin) { it => diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala index c62d6ca1a..6c710a5fc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5932Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5932Test extends Rql2TestContext { +class RD5932Test extends SnapiTestContext { val data = tempFile("""[ | {"id": 1, "network_interface": "eni-08b85cc07294f82bf"}, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala index e7b3a0e47..7eee77f04 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5968Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5968Test extends Rql2TestContext { +class RD5968Test extends SnapiTestContext { private val cdataFile = tempFile(""" | diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala index 28f8d0679..4aef4d495 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5971Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5971Test extends Rql2TestContext { +class RD5971Test extends SnapiTestContext { // error when type isn't supported test(s"""[{a: "binary", b: [1,2,3,4]}]""") { it => diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala index c02cc1cbd..cee5b0aa7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD5979Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5979Test extends Rql2TestContext { +class RD5979Test extends SnapiTestContext { test("""[{a: 12, b: 14}, {c: 23, d: 54}]""")(_ should runErrorAs("expected compatible with")) test("""[{a: 12, b: 14}, {a: 23, d: 54}]""")(_ should runErrorAs("expected compatible with")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala index f3b3e7751..22d7bfa3a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7924Test.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Path -class RD7924Test extends Rql2TestContext { +class RD7924Test extends SnapiTestContext { val string: Path = tempFile(""" "Hello!" """) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala index 0003a834c..6a2eecb5f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD7974Test.scala @@ -14,12 +14,12 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.RawUtils import org.scalatest.BeforeAndAfterEach -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.core._ import java.nio.file.Files -class RD7974Test extends Rql2TestContext with BeforeAndAfterEach { +class RD7974Test extends SnapiTestContext with BeforeAndAfterEach { private val tmpFile = Files.createTempFile("csv-output-test", ".csv") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala index c336cceb1..67978dbb6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8530Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import org.scalatest.BeforeAndAfterEach -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD8530Test extends Rql2TestContext with BeforeAndAfterEach { +class RD8530Test extends SnapiTestContext with BeforeAndAfterEach { test("""List.Filter([1,2,3,4], n -> n > 2, a = 12)""".stripMargin)( _ should typeErrorAs("no optional arguments expected") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala index 9f9d4859a..510e75a8c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8764Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD8764Test extends Rql2TestContext with StrictLogging { +class RD8764Test extends SnapiTestContext with StrictLogging { test(""" |let f: (record(_1: int, _2: int)) -> bool = (x: int, y: int) -> x == y diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala index b4596ac71..ab08e2382 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8935Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD8935Test extends Rql2TestContext { +class RD8935Test extends SnapiTestContext { private val vowels = tempFile("""a |e diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala index b0aeaa627..2b1436b31 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD8993Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD8993Test extends Rql2TestContext { +class RD8993Test extends SnapiTestContext { test("""apply(f: int -> bool) = f(1) |apply((x: int) -> true)""".stripMargin)(_ should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala index 3b338936e..dc9de930a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9137Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.typesafe.scalalogging.StrictLogging -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9137Test extends Rql2TestContext with StrictLogging { +class RD9137Test extends SnapiTestContext with StrictLogging { test("""Json.InferAndRead("https://raw-tutorial.s3.eu-west-1.amazonaws.com/patients.json")""".stripMargin)( _ should run diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala index 677b81435..58ee6a9cc 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9228Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9228Test extends Rql2TestContext { +class RD9228Test extends SnapiTestContext { // pass a plain URL. It will be turned into a location, directly passed as a parameter. test(""" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala index 25779ecff..7a51562d6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9229Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9229Test extends Rql2TestContext { +class RD9229Test extends SnapiTestContext { test(s"""[{a: "binary", b: [1,2,3,4]}]""") { it => option("output-format", "binary") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala index 001b05744..132ca5d99 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9255Test.scala @@ -30,11 +30,11 @@ import com.rawlabs.compiler.{ RawValue } import org.scalatest.EitherValues -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.time.{Duration, LocalDate, LocalDateTime, LocalTime} -class RD9255Test extends Rql2TestContext with EitherValues { +class RD9255Test extends SnapiTestContext with EitherValues { private val declarations = """ |string_func(x: string) = String.Length(x) @@ -152,7 +152,7 @@ class RD9255Test extends Rql2TestContext with EitherValues { exec("byte_func", "tralala", "byte").left.value should include("expected byte but got string") ) test("missing mandatory arguments") { _ => - assume(compilerService.language.contains("rql2-truffle")) + assume(compilerService.language.contains("snapi")) callDecl(declarations, "three_param_func", Array(("x", RawString("U"))), "string").left.value should include( "missing mandatory arguments" ) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala index 111c0fa38..807030bb2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9359Test.scala @@ -12,12 +12,12 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext +import com.rawlabs.snapi.frontend.snapi._ import java.nio.file.{Files, Path} -class RD9359Test extends Rql2TestContext { +class RD9359Test extends SnapiTestContext { private val duplicateCsvString = """a,b,a |1,2,3 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala index 3ee615930..7371a91a2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9409Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.compiler.{HoverResponse, Pos, TypeCompletion} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9409Test extends Rql2TestContext { +class RD9409Test extends SnapiTestContext { test("""let | a = 1, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala index 99877ee34..9745125f0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9445Test.scala @@ -14,12 +14,12 @@ package com.rawlabs.snapi.compiler.tests.regressions import com.rawlabs.utils.core.TestData import org.scalatest.matchers.{MatchResult, Matcher} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import java.nio.file.Files import scala.io.Source -class RD9445Test extends Rql2TestContext { +class RD9445Test extends SnapiTestContext { def outputAs(expected: String, format: String = "json") = new OutputAs(expected, format) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala index 65ad2a244..6df56402a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9479Test.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9479Test extends Rql2TestContext { +class RD9479Test extends SnapiTestContext { private val recordData = tempFile("""[{"a": 1, "b": 10, "c": 100}]""") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala index 763bf4b73..4551d5059 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9485Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9485Test extends Rql2TestContext { +class RD9485Test extends SnapiTestContext { property("raw.snapi.frontend.inferrer.local.xml.sample-size", "2") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala index 134a9cd4f..a7a53913f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9554Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9554Test extends Rql2TestContext { +class RD9554Test extends SnapiTestContext { test("""let range = Int.Range(0,5) |in Collection.Union(range, range)""".stripMargin) { it => diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala index eaeb66be3..f11bcae51 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9616Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9616Test extends Rql2TestContext { +class RD9616Test extends SnapiTestContext { test( """let diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala index bc178d66e..e7075881d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/RD9932Test.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.regressions -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD9932Test extends Rql2TestContext { +class RD9932Test extends SnapiTestContext { val ttt = "\"\"\"" test(s"""Json.Parse( diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala index 20dd39439..092c2ea62 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD3084Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD3084Test extends Rql2TestContext { +class RD3084Test extends SnapiTestContext { rdbms("mysql-test", TestCredentials.mysqlCreds) rdbms("postgres-test", TestCredentials.pgsqlCreds) @@ -49,13 +49,13 @@ class RD3084Test extends Rql2TestContext { } test("""Oracle.InferAndQuery("oracle-test", "select * from rawtest.test_types")""") { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should run } test("""Oracle.Query("oracle-test", "select * from rawtest.test_types", | type collection(record(integer1: int, char1: string)))""".stripMargin) { it => - assume(!compilerService.language.contains("rql2-truffle")) + assume(!compilerService.language.contains("snapi")) it should run } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala index a8fc38135..366d6837b 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD4445Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions.credentials import com.rawlabs.protocol.compiler.DropboxAccessTokenConfig -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD4445Test extends Rql2TestContext { +class RD4445Test extends SnapiTestContext { import com.rawlabs.snapi.compiler.tests.TestCredentials._ diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala index 3473efdea..590edfbdd 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/regressions/credentials/RD5932Test.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.regressions.credentials import com.rawlabs.snapi.compiler.tests.TestCredentials -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class RD5932Test extends Rql2TestContext { +class RD5932Test extends SnapiTestContext { s3Bucket(TestCredentials.UnitTestPrivateBucket, TestCredentials.UnitTestPrivateBucketCred) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala index 07ce2c497..a6a54d8b2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BasicStagedCompilerTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BasicStagedCompilerTest extends Rql2TestContext { +class BasicStagedCompilerTest extends SnapiTestContext { test("""TestPackage.ByteValueArg(22b)""")(_ should evaluateTo("{arg: 22b}")) test("""TestPackage.ShortValueArg(22s)""")(_ should evaluateTo("{arg: 22s}")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala index 020f41529..962502f85 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpAndTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpAndTest extends Rql2TestContext with TableDrivenPropertyChecks { +class BinaryExpAndTest extends SnapiTestContext with TableDrivenPropertyChecks { test("""true and true""")(_ should evaluateTo("true")) test("""true and false""")(_ should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala index 760ea1835..ae2273d81 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpDivTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpDivTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpDivTest extends SnapiTestContext with CombinationSpecTestHelper { test("""4 / 2""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala index 134adb794..fd0cb791c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpEqTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpEqTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpEqTest extends SnapiTestContext with CombinationSpecTestHelper { test("1 == 1")(it => it should evaluateTo("true")) test("1 == 2")(it => it should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala index b8258e485..07de982ae 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpGeTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpGeTest extends SnapiTestContext with CombinationSpecTestHelper { test("1 >= 1")(it => it should evaluateTo("true")) test("1 >= 2")(it => it should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala index a4ca7be50..947baeaa0 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpGtTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpGtTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpGtTest extends SnapiTestContext with CombinationSpecTestHelper { test("1 > 1")(it => it should evaluateTo("false")) test("1 > 2")(it => it should evaluateTo("false")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala index 94a3c0d08..4309757f6 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLeTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpLeTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpLeTest extends SnapiTestContext with CombinationSpecTestHelper { test("1 <= 1")(it => it should evaluateTo("true")) test("1 <= 2")(it => it should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala index 54af58303..4a726e526 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpLtTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpLtTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpLtTest extends SnapiTestContext with CombinationSpecTestHelper { test("1 < 1")(it => it should evaluateTo("false")) test("1 < 2")(it => it should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala index 096efd4c6..652c30a1e 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpModTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpModTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpModTest extends SnapiTestContext with CombinationSpecTestHelper { test("""5 % 3""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala index 35d029d94..7d9d0f423 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpMultTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpMultTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpMultTest extends SnapiTestContext with CombinationSpecTestHelper { test("""1 * 1""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala index b27e0650f..272d3c0b7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpNeqTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpNeqTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpNeqTest extends SnapiTestContext with CombinationSpecTestHelper { test("1 != 1")(it => it should evaluateTo("false")) test("1 != 2")(it => it should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala index 34a0bd67c..616fe7e5a 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpOrTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpOrTest extends Rql2TestContext with TableDrivenPropertyChecks { +class BinaryExpOrTest extends SnapiTestContext with TableDrivenPropertyChecks { test("""true or true""")(_ should evaluateTo("true")) test("""true or false""")(_ should evaluateTo("true")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala index ece722370..a77734229 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpPlusTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpPlusTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpPlusTest extends SnapiTestContext with CombinationSpecTestHelper { test("""1 + 1""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala index 1580b4b08..25d68414d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/BinaryExpSubTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class BinaryExpSubTest extends Rql2TestContext with CombinationSpecTestHelper { +class BinaryExpSubTest extends SnapiTestContext with CombinationSpecTestHelper { test("""1 - 1""") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala index ea5a3919f..398239758 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ClosureTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ClosureTest extends Rql2TestContext { +class ClosureTest extends SnapiTestContext { test("""let functions = | List.Transform([1,2,3], diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala index 67d9c7b35..3f6b8a9b5 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ConstTest.scala @@ -14,20 +14,20 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.frontend.rql2.source.{Rql2BoolType, Rql2IntType, Rql2StringType} -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.source.{SnapiBoolType, SnapiIntType, SnapiStringType} +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ConstTest extends Rql2TestContext with TableDrivenPropertyChecks { +class ConstTest extends SnapiTestContext with TableDrivenPropertyChecks { test("1") { it => it should typeAs("int") - it should astTypeAs(Rql2IntType()) + it should astTypeAs(SnapiIntType()) it should evaluateTo("1") } test(""" "Hello" """) { it => it should typeAs("string") - it should astTypeAs(Rql2StringType()) + it should astTypeAs(SnapiStringType()) it should evaluateTo(""""Hello"""") } @@ -36,7 +36,7 @@ class ConstTest extends Rql2TestContext with TableDrivenPropertyChecks { // was in the source code. it should parse it should typeAs("string") - it should astTypeAs(Rql2StringType()) + it should astTypeAs(SnapiStringType()) it should run it should evaluateTo(""""x\u2192x+1"""") } @@ -45,7 +45,7 @@ class ConstTest extends Rql2TestContext with TableDrivenPropertyChecks { // The source code contains the unicode character. It should parse and run. it should parse it should typeAs("string") - it should astTypeAs(Rql2StringType()) + it should astTypeAs(SnapiStringType()) it should run it should evaluateTo(""""x\u2192x+1"""") } @@ -54,14 +54,14 @@ class ConstTest extends Rql2TestContext with TableDrivenPropertyChecks { // The source code is using triple quoted string, it can contain the unicode character it should parse it should typeAs("string") - it should astTypeAs(Rql2StringType()) + it should astTypeAs(SnapiStringType()) it should run it should evaluateTo(""""x\u2192x+1"""") } test(""" true """) { it => it should typeAs("bool") - it should astTypeAs(Rql2BoolType()) + it should astTypeAs(SnapiBoolType()) it should evaluateTo("""true""") } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala index ae1d545a6..3e5ccd618 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ErrorsTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ErrorsTest extends Rql2TestContext { +class ErrorsTest extends SnapiTestContext { test("""Collection.Count("a")""")(_ shouldNot tipe) test("""Collection.Count(Collection.Count("a"))""")(_ shouldNot tipe) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala index 35434b643..a5297f899 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/FunAbsTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class FunAbsTest extends Rql2TestContext { +class FunAbsTest extends SnapiTestContext { test(""" |let f = (v: int) -> v + 1 diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala index 9a2b46ffc..273f50346 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/IfThenElseTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class IfThenElseTest extends Rql2TestContext with CombinationSpecTestHelper { +class IfThenElseTest extends SnapiTestContext with CombinationSpecTestHelper { test(""" |if true then "a" else "b" diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala index 8e03939e1..1930911c8 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ImplicitCastTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ImplicitCastTest extends Rql2TestContext { +class ImplicitCastTest extends SnapiTestContext { // compatible options as function param test(s"""let f = (x: int) -> Record.Build(o = x) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala index 412f0983c..afbcec3f4 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/JoinWithTryRowsTest.scala @@ -12,11 +12,11 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext import com.rawlabs.utils.sources.filesystem.local.LocalLocationsTestContext -import com.rawlabs.snapi.frontend.rql2._ +import com.rawlabs.snapi.frontend.snapi._ -class JoinWithTryRowsTest extends Rql2TestContext with LocalLocationsTestContext { +class JoinWithTryRowsTest extends SnapiTestContext with LocalLocationsTestContext { /* testing joins with failed rows. How a dataset of failed rows is built: by engineering a dataset of nested list of records, and pick one using List.Get so that it sometimes diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala index eb6a7b8ea..b8c9c9509 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetBindTest.scala @@ -13,9 +13,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LetBindTest extends Rql2TestContext with CombinationSpecTestHelper { +class LetBindTest extends SnapiTestContext with CombinationSpecTestHelper { test("""let x = 1 |in x diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala index 0e2a7a32f..88d98495f 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunRecTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.frontend.rql2.errors.OutputTypeRequiredForRecursiveFunction -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi.errors.OutputTypeRequiredForRecursiveFunction +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LetFunRecTest extends Rql2TestContext { +class LetFunRecTest extends SnapiTestContext { test("""let rec fact(v: int): int = if (v > 1) then v * fact(v - 1) else v |in fact(4) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala index f54535e6a..adf7eb45d 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetFunTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LetFunTest extends Rql2TestContext { +class LetFunTest extends SnapiTestContext { test("""let f(x: int) = x + 1 |in f(0) @@ -248,7 +248,7 @@ class LetFunTest extends Rql2TestContext { | functions = List.Transform(numbers, n -> let f(x: int, v: int = n) = x * v in f) |in List.Transform(functions, f -> f(10)) |""".stripMargin) { it => - assume(compilerService.language.contains("rql2-truffle")) // The scala executor fails to turn this code to L0 + assume(compilerService.language.contains("snapi")) // The scala executor fails to turn this code to L0 it should evaluateTo("[10, 20, 30, 40]") } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala index 1d8746387..1e8a84b74 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/LetTypeTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class LetTypeTest extends Rql2TestContext { +class LetTypeTest extends SnapiTestContext { test(""" |let t = type int, diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala index f24f18ece..dff8882e7 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/MigrationTest.scala @@ -12,19 +12,19 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.frontend.rql2.source.{ - Rql2IntType, - Rql2IsNullableTypeProperty, - Rql2IsTryableTypeProperty, - Rql2UndefinedType +import com.rawlabs.snapi.frontend.snapi.source.{ + SnapiIntType, + SnapiIsNullableTypeProperty, + SnapiIsTryableTypeProperty, + SnapiUndefinedType } -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class MigrationTest extends Rql2TestContext { +class MigrationTest extends SnapiTestContext { test("1") { it => it should typeAs("int") - it should astTypeAs(Rql2IntType()) + it should astTypeAs(SnapiIntType()) it should evaluateTo("1") } @@ -38,13 +38,13 @@ class MigrationTest extends Rql2TestContext { test("""Error.Build("broken!")""") { it => it should typeAs("undefined") - it should astTypeAs(Rql2UndefinedType(Set(Rql2IsTryableTypeProperty()))) + it should astTypeAs(SnapiUndefinedType(Set(SnapiIsTryableTypeProperty()))) it should runErrorAs("""broken!""") } test("Success.Build(1)") { it => it should typeAs("int") - it should astTypeAs(Rql2IntType(Set(Rql2IsTryableTypeProperty()))) + it should astTypeAs(SnapiIntType(Set(SnapiIsTryableTypeProperty()))) it should evaluateTo("1") } @@ -64,14 +64,14 @@ class MigrationTest extends Rql2TestContext { test("""null""") { it => it should typeAs("undefined") - it should astTypeAs(Rql2UndefinedType(Set(Rql2IsNullableTypeProperty()))) + it should astTypeAs(SnapiUndefinedType(Set(SnapiIsNullableTypeProperty()))) } test("""let x: int = null | in x |""".stripMargin) { it => it should typeAs("int") - it should astTypeAs(Rql2IntType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty()))) + it should astTypeAs(SnapiIntType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty()))) it should evaluateTo("null") } diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala index 458463cc7..5d48c3aed 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PackageNameTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class PackageNameTest extends Rql2TestContext { +class PackageNameTest extends SnapiTestContext { test("""Record""")(it => it should typeAs("""package("Record")""")) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala index f03693c65..4457dfee9 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/ProjTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class ProjTest extends Rql2TestContext { +class ProjTest extends SnapiTestContext { test("""let a = {x: 1} |in a.x diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala index e92216788..ae1a45237 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/PropagationTest.scala @@ -12,9 +12,9 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class PropagationTest extends Rql2TestContext { +class PropagationTest extends SnapiTestContext { // lists test("""let l = List.Build(1,2,3,2,1) |in TestPackage.StrictArgs(l)""".stripMargin)(_ should (typeAs("float") and evaluateTo("5.0f"))) diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala index 9f8fe1c17..4a244fd7c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/StagedCompilerTest.scala @@ -12,10 +12,10 @@ package com.rawlabs.snapi.compiler.tests.spec -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class StagedCompilerTest extends Rql2TestContext { +class StagedCompilerTest extends SnapiTestContext { val data = tempFile(""" |[ @@ -36,7 +36,7 @@ class StagedCompilerTest extends Rql2TestContext { |3, 30, 300 |""".stripMargin) -// test(rql""" +// test(snapi""" // |let f = "$data", // | data = Json.InferAndRead(f) // |in diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala index 5f01e623c..339158ee2 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNegTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class UnaryExpNegTest extends Rql2TestContext with TableDrivenPropertyChecks { +class UnaryExpNegTest extends SnapiTestContext with TableDrivenPropertyChecks { test("- 1") { it => it should typeAs("int") diff --git a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala index 3811d58ed..e9d5c523c 100644 --- a/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala +++ b/snapi-compiler/src/test/scala/com/rawlabs/snapi/compiler/tests/spec/UnaryExpNotTest.scala @@ -14,9 +14,9 @@ package com.rawlabs.snapi.compiler.tests.spec import com.rawlabs.utils.core.TestData import org.scalatest.prop.TableDrivenPropertyChecks -import com.rawlabs.snapi.compiler.tests.Rql2TestContext +import com.rawlabs.snapi.compiler.tests.SnapiTestContext -class UnaryExpNotTest extends Rql2TestContext with TableDrivenPropertyChecks { +class UnaryExpNotTest extends SnapiTestContext with TableDrivenPropertyChecks { test("""not true""".stripMargin) { it => it should typeAs("bool") it should evaluateTo("false") diff --git a/snapi-frontend/src/main/java/module-info.java b/snapi-frontend/src/main/java/module-info.java index 5b2977fd3..892502b13 100644 --- a/snapi-frontend/src/main/java/module-info.java +++ b/snapi-frontend/src/main/java/module-info.java @@ -47,18 +47,18 @@ exports com.rawlabs.snapi.frontend.base; exports com.rawlabs.snapi.frontend.base.errors; exports com.rawlabs.snapi.frontend.base.source; - exports com.rawlabs.snapi.frontend.rql2; - exports com.rawlabs.snapi.frontend.rql2.source; - exports com.rawlabs.snapi.frontend.rql2.phases; - exports com.rawlabs.snapi.frontend.rql2.errors; - exports com.rawlabs.snapi.frontend.rql2.antlr4; - exports com.rawlabs.snapi.frontend.rql2.extensions; - exports com.rawlabs.snapi.frontend.rql2.extensions.builtin; + exports com.rawlabs.snapi.frontend.snapi; + exports com.rawlabs.snapi.frontend.snapi.source; + exports com.rawlabs.snapi.frontend.snapi.phases; + exports com.rawlabs.snapi.frontend.snapi.errors; + exports com.rawlabs.snapi.frontend.snapi.antlr4; + exports com.rawlabs.snapi.frontend.snapi.extensions; + exports com.rawlabs.snapi.frontend.snapi.extensions.builtin; exports com.rawlabs.snapi.frontend.inferrer.api; exports com.rawlabs.snapi.frontend.inferrer.local; opens com.rawlabs.snapi.frontend.inferrer.api to com.fasterxml.jackson.databind; - opens com.rawlabs.snapi.frontend.rql2.extensions to + opens com.rawlabs.snapi.frontend.snapi.extensions to com.fasterxml.jackson.databind; } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala index d46d15c34..bde082af7 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/Tree.scala @@ -16,7 +16,7 @@ import com.rawlabs.utils.core.RawUtils import org.apache.commons.lang3.StringUtils import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.rql2.source.ErrorType +import com.rawlabs.snapi.frontend.snapi.source.ErrorType import com.rawlabs.utils.core._ abstract class Tree[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest]( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala index dd233e19d..433a5bb54 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/base/TreeWithPositions.scala @@ -17,7 +17,7 @@ import com.rawlabs.utils.core.RawUtils import org.bitbucket.inkytonik.kiama.util.Positions import com.rawlabs.snapi.frontend.base.errors.CompilationMessageMapper import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.rql2.antlr4.ParseProgramResult +import com.rawlabs.snapi.frontend.snapi.antlr4.ParseProgramResult import com.rawlabs.utils.core._ abstract class TreeWithPositions[N <: BaseNode: Manifest, P <: N: Manifest, E <: N: Manifest]( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala index a6aadd7a7..722cbcd93 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/inferrer/local/LocalInferrerService.scala @@ -15,7 +15,7 @@ package com.rawlabs.snapi.frontend.inferrer.local import com.rawlabs.utils.core.{RawException, RawSettings} import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.output.PrettyPrinter -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription import com.rawlabs.snapi.frontend.inferrer.api._ import com.rawlabs.snapi.frontend.inferrer.local.auto.{AutoInferrer, InferrerBufferedSeekableIS} import com.rawlabs.snapi.frontend.inferrer.local.csv.{CsvInferrer, CsvMergeTypes} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala deleted file mode 100644 index 7459f9e27..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2TypeUtils.scala +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2 - -import com.rawlabs.compiler.{ - RawAttrType, - RawBinaryType, - RawBoolType, - RawByteType, - RawDateType, - RawDecimalType, - RawDoubleType, - RawFloatType, - RawIntType, - RawIntervalType, - RawIterableType, - RawListType, - RawLongType, - RawOrType, - RawRecordType, - RawShortType, - RawStringType, - RawTimeType, - RawTimestampType, - RawType, - RawUndefinedType -} -import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} -import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalPackageBuilder -import com.rawlabs.snapi.frontend.inferrer.api._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ - DatePackageBuilder, - ListPackageBuilder, - NullablePackageBuilder, - RecordPackageBuilder, - TimePackageBuilder, - TimestampPackageBuilder -} - -trait Rql2TypeUtils { - - final def hasTypeConstraint(t: Type): Boolean = { - everywhere(query[Any] { case _: CommonTypeConstraint | _: Rql2TypeConstraint | _: AnythingType => return true })(t) - false - } - - final def isTypeConstraint(t: Type): Boolean = { - t match { - case _: CommonTypeConstraint | _: Rql2TypeConstraint | _: AnythingType => true - case _ => false - } - } - - final def getProps(t: Type): Set[Rql2TypeProperty] = t match { - case t: Rql2TypeWithProperties => t.props - case _ => Set.empty - } - - final def addProp(t: Type, p: Rql2TypeProperty): Type = t match { - case t: Rql2TypeWithProperties => t.cloneAndAddProp(p) - case _ => t - } - - final def addProps(t: Type, props: Set[Rql2TypeProperty]): Type = { - props.foldLeft(t) { case (t, p) => addProp(t, p) } - } - - final def removeProp(t: Type, p: Rql2TypeProperty): Type = t match { - case t: Rql2TypeWithProperties => t.cloneAndRemoveProp(p) - case _ => t - } - - final def removeProps(t: Type, props: Set[Rql2TypeProperty]): Type = { - props.foldLeft(t) { case (t, p) => removeProp(t, p) } - } - - final def resetProps(t: Type, props: Set[Rql2TypeProperty]): Type = { - val clean = removeProps(t, getProps(t)) - addProps(clean, props) - } - - final def inferTypeToRql2Type(t: SourceType, makeNullable: Boolean, makeTryable: Boolean): Type = { - def wrapProps(t: Type, nullable: Boolean, tryable: Boolean): Type = { - val nullType = if (nullable) addProp(t, Rql2IsNullableTypeProperty()) else t - if (tryable) addProp(nullType, Rql2IsTryableTypeProperty()) else nullType - } - - t match { - case SourceByteType(n) => wrapProps(Rql2ByteType(), n || makeNullable, makeTryable) - case SourceShortType(n) => wrapProps(Rql2ShortType(), n || makeNullable, makeTryable) - case SourceIntType(n) => wrapProps(Rql2IntType(), n || makeNullable, makeTryable) - case SourceLongType(n) => wrapProps(Rql2LongType(), n || makeNullable, makeTryable) - case SourceFloatType(n) => wrapProps(Rql2FloatType(), n || makeNullable, makeTryable) - case SourceDoubleType(n) => wrapProps(Rql2DoubleType(), n || makeNullable, makeTryable) - case SourceDecimalType(n) => wrapProps(Rql2DecimalType(), n || makeNullable, makeTryable) - case SourceBoolType(n) => wrapProps(Rql2BoolType(), n || makeNullable, makeTryable) - case SourceStringType(n) => wrapProps(Rql2StringType(), n || makeNullable, makeTryable) - case SourceDateType(_, n) => wrapProps(Rql2DateType(), n || makeNullable, makeTryable) - case SourceTimeType(_, n) => wrapProps(Rql2TimeType(), n || makeNullable, makeTryable) - case SourceTimestampType(_, n) => wrapProps(Rql2TimestampType(), n || makeNullable, makeTryable) - case SourceIntervalType(n) => wrapProps(Rql2IntervalType(), n || makeNullable, makeTryable) - case SourceRecordType(atts, n) => wrapProps( - Rql2RecordType( - atts.map(att => Rql2AttrType(att.idn, inferTypeToRql2Type(att.tipe, makeNullable, makeTryable))) - ), - n || makeNullable, - makeTryable - ) - case SourceCollectionType(inner, n) => wrapProps( - Rql2IterableType(inferTypeToRql2Type(inner, makeNullable, makeTryable)), - n || makeNullable, - makeTryable - ) - case SourceBinaryType(n) => wrapProps(Rql2BinaryType(), n || makeNullable, makeTryable) - case _: SourceNothingType => wrapProps(Rql2UndefinedType(), makeNullable, makeTryable) - case _: SourceNullType => wrapProps(Rql2UndefinedType(), true, makeTryable) - case _: SourceAnyType => AnyType() - case SourceOrType(ors) => - val options = ors - .map(x => inferTypeToRql2Type(x, makeNullable, makeTryable)) // recurse with the flags - .map(t => resetProps(t, Set.empty)) // but clear 'tryable' from or type options + nullable - val nullable = ors.exists(_.nullable) - if (nullable) Rql2OrType(options.toVector, Set(Rql2IsNullableTypeProperty())) - else Rql2OrType(options.toVector) - } - - } - - def isComparable(t: Type): Boolean = { - everywhere(query[Type] { case _: FunType => return false })(t) - true - } - - // Returns Option[RawType] as not all Rql2 types are representable as Raw types. - def rql2TypeToRawType(t: Type): Option[RawType] = { - def convert(t: Type): RawType = { - // Read nullable and triable properties. - var nullable = false - var triable = false - t match { - case tp: Rql2TypeWithProperties => - if (tp.props.contains(Rql2IsNullableTypeProperty())) { - nullable = true - } - if (tp.props.contains(Rql2IsTryableTypeProperty())) { - triable = true - } - case _ => - } - // Convert type. - t match { - case _: Rql2UndefinedType => RawUndefinedType(nullable, triable) - case _: Rql2ByteType => RawByteType(nullable, triable) - case _: Rql2ShortType => RawShortType(nullable, triable) - case _: Rql2IntType => RawIntType(nullable, triable) - case _: Rql2LongType => RawLongType(nullable, triable) - case _: Rql2FloatType => RawFloatType(nullable, triable) - case _: Rql2DoubleType => RawDoubleType(nullable, triable) - case _: Rql2DecimalType => RawDecimalType(nullable, triable) - case _: Rql2BoolType => RawBoolType(nullable, triable) - case _: Rql2StringType => RawStringType(nullable, triable) - case _: Rql2BinaryType => RawBinaryType(nullable, triable) - case _: Rql2DateType => RawDateType(nullable, triable) - case _: Rql2TimeType => RawTimeType(nullable, triable) - case _: Rql2TimestampType => RawTimestampType(nullable, triable) - case _: Rql2IntervalType => RawIntervalType(nullable, triable) - case Rql2RecordType(atts, _) => RawRecordType( - atts.map { case Rql2AttrType(idn, t1) => RawAttrType(idn, convert(t1)) }, - nullable, - triable - ) - case Rql2ListType(inner, _) => RawListType(convert(inner), nullable, triable) - case Rql2IterableType(inner, _) => RawIterableType(convert(inner), nullable, triable) - case Rql2OrType(ors, _) => RawOrType(ors.map(convert), nullable, triable) - case _ => throw new IllegalArgumentException() - } - } - - try { - Some(convert(t)) - } catch { - case _: IllegalArgumentException => None - } - } - - final def valueToExp(value: Rql2Value, t: Type): Exp = value match { - case Rql2ByteValue(v) => ByteConst(v.toString) - case Rql2ShortValue(v) => ShortConst(v.toString) - case Rql2IntValue(v) => IntConst(v.toString) - case Rql2LongValue(v) => LongConst(v.toString) - case Rql2FloatValue(v) => FloatConst(v.toString) - case Rql2DoubleValue(v) => DoubleConst(v.toString) - case Rql2StringValue(v) => StringConst(v) - case Rql2BoolValue(v) => BoolConst(v) - case Rql2OptionValue(option) => - val innerType = resetProps(t, Set.empty) - option - .map(v => valueToExp(v, innerType)) - .map(NullablePackageBuilder.Build(_)) - .getOrElse(NullablePackageBuilder.Empty(innerType)) - case Rql2RecordValue(vs) => - val Rql2RecordType(atts, _) = t - RecordPackageBuilder.Build( - vs.zip(atts).map { case (Rql2RecordAttr(idn, v1), att) => idn -> valueToExp(v1, att.tipe) }.toVector - ) - case Rql2ListValue(v) => - val Rql2ListType(innerType, _) = t - ListPackageBuilder.Build(v.map(x => valueToExp(x, innerType)): _*) - case Rql2DateValue(v) => DatePackageBuilder.FromLocalDate(v) - case Rql2TimeValue(v) => TimePackageBuilder.FromLocalTime(v) - case Rql2TimestampValue(v) => TimestampPackageBuilder.FromLocalDateTime(v) - case Rql2IntervalValue( - years, - month, - weeks, - days, - hours, - minutes, - seconds, - millis - ) => IntervalPackageBuilder.FromRawInterval(years, month, weeks, days, hours, minutes, seconds, millis) - } - -} - -object Rql2TypeUtils extends Rql2TypeUtils diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala deleted file mode 100644 index 9705e97f1..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Rql2Values.scala +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2 - -import com.rawlabs.utils.sources.api.Location - -sealed trait Rql2Value -final case class Rql2StringValue(v: String) extends Rql2Value -final case class Rql2BoolValue(v: Boolean) extends Rql2Value -final case class Rql2BinaryValue(v: Array[Byte]) extends Rql2Value -final case class Rql2ByteValue(v: Byte) extends Rql2Value -final case class Rql2ShortValue(v: Short) extends Rql2Value -final case class Rql2IntValue(v: Int) extends Rql2Value -final case class Rql2LongValue(v: Long) extends Rql2Value -final case class Rql2FloatValue(v: Float) extends Rql2Value -final case class Rql2DoubleValue(v: Double) extends Rql2Value -final case class Rql2DecimalValue(v: BigDecimal) extends Rql2Value -final case class Rql2DateValue(v: java.time.LocalDate) extends Rql2Value -final case class Rql2TimeValue(v: java.time.LocalTime) extends Rql2Value -final case class Rql2TimestampValue(v: java.time.LocalDateTime) extends Rql2Value -final case class Rql2IntervalValue( - years: Int, - months: Int, - weeks: Int, - days: Int, - hours: Int, - minutes: Int, - seconds: Int, - millis: Int -) extends Rql2Value -final case class Rql2LocationValue(l: Location, publicDescription: String) extends Rql2Value -final case class Rql2RecordValue(v: Seq[Rql2RecordAttr]) extends Rql2Value -final case class Rql2RecordAttr(name: String, value: Rql2Value) -final case class Rql2TryValue(v: Either[String, Rql2Value]) extends Rql2Value -final case class Rql2OptionValue(v: Option[Rql2Value]) extends Rql2Value -final case class Rql2ListValue(v: Seq[Rql2Value]) extends Rql2Value -final case class Rql2IterableValue(v: Seq[Rql2Value]) extends Rql2Value // Data has been ready is now materialized. diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala deleted file mode 100644 index 7f9bb66fc..000000000 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceTree.scala +++ /dev/null @@ -1,559 +0,0 @@ -/* - * Copyright 2023 RAW Labs S.A. - * - * Use of this software is governed by the Business Source License - * included in the file licenses/BSL.txt. - * - * As of the Change Date specified in that file, in accordance with - * the Business Source License, use of this software will be governed - * by the Apache License, Version 2.0, included in the file - * licenses/APL.txt. - */ - -package com.rawlabs.snapi.frontend.rql2.source - -import org.bitbucket.inkytonik.kiama.output._ -import org.bitbucket.inkytonik.kiama.output.PrettyExpression -import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.base.Counter -import com.rawlabs.snapi.frontend.base.source._ - -trait SourceNode extends BaseNode - -object SourceTree { - import org.bitbucket.inkytonik.kiama.relation.Tree - - type SourceTree = Tree[SourceNode, SourceProgram] -} - -/** - * Top-level source node. - */ -trait SourceProgram extends SourceNode with BaseProgram { - def params: Vector[SourceProgramParam] - def comment: Option[String] = None -} - -final case class SourceProgramParam(idn: CommonIdnNode, t: Type) extends CommonNode - -/** - * Qualifiers - */ -// TODO (msb): These are best called "Statements" because that's (also?) what they are -// Qual is more general than Stmt: a Gen is a Qual but not a Stmt while Bind is -trait Qual extends SourceNode - -/** - * Declarations - */ -trait Decl extends SourceNode with Qual - -/** - * Expressions - */ -trait Exp extends SourceNode with Qual with PrettyExpression - -/** - * * From now on are "common language"-related nodes. ** - */ - -/** - * Parent of all "common language" nodes. - */ -trait CommonNode extends SourceNode - -/** - * Parent of all "common language" types. - */ -trait CommonType extends Type with CommonNode - -/** - * Any Type - * The top type. - */ -final case class AnyType() extends CommonType - -/** - * Nothing Type - * The bottom type. - */ -final case class NothingType() extends CommonType - -/** - * This type is used when the tree has errors. - */ -final case class ErrorType() extends CommonType - -/** - * Parent of all "common language" expressions. - */ -trait CommonExp extends Exp with CommonNode - -/////////////////////////////////////////////////////////////////////////// -// Type Constraints -/////////////////////////////////////////////////////////////////////////// - -trait CommonTypeConstraint extends CommonType - -/** - * One-of Type constraint. - */ -final case class OneOfType(tipes: Vector[Type]) extends CommonTypeConstraint - -object OneOfType { - def apply(tipes: Type*): OneOfType = { - OneOfType(tipes.toVector) - } -} - -final case class ExpectedRecordType(idns: Set[String]) extends CommonTypeConstraint - -/////////////////////////////////////////////////////////////////////////// -// Identifiers -/////////////////////////////////////////////////////////////////////////// - -abstract class CommonIdnNode extends BaseIdnNode with CommonNode - -/** - * Defining occurrence of an identifier - */ -final case class IdnDef(idn: String) extends CommonIdnNode - -object IdnDef { - def apply(): IdnDef = IdnDef(Counter.next("common")) -} - -/** - * Use of an identifier - */ -final case class IdnUse(idn: String) extends CommonIdnNode - -object IdnUse { - def apply(i: IdnDef): IdnUse = IdnUse(i.idn) -} - -/** - * Identifier expression - */ -final case class IdnExp(idn: IdnUse) extends CommonExp - -object IdnExp { - def apply(i: IdnDef): IdnExp = IdnExp(IdnUse(i.idn)) - def apply(i: String): IdnExp = IdnExp(IdnUse(i)) - def apply(p: SourceProgramParam): IdnExp = IdnExp(p.idn.idn) - def apply(p: BaseIdnNode): IdnExp = IdnExp(p.idn) -} - -/////////////////////////////////////////////////////////////////////////// -// Expressions -/////////////////////////////////////////////////////////////////////////// - -final case class ErrorExp() extends CommonExp - -/////////////////////////////////////////////////////////////////////////// -// RQL2 -/////////////////////////////////////////////////////////////////////////// - -sealed trait Rql2Node extends SourceNode - -/////////////////////////////////////////////////////////////////////////// -// Program -/////////////////////////////////////////////////////////////////////////// - -final case class Rql2Program(methods: Vector[Rql2Method], me: Option[Exp]) extends Rql2Node with SourceProgram { - override val params: Vector[SourceProgramParam] = Vector.empty -} - -object Rql2Program { - def apply(e: Exp): Rql2Program = Rql2Program(Vector.empty, Some(e)) -} - -final case class Rql2Method(p: FunProto, i: IdnDef) extends Rql2Node - -/////////////////////////////////////////////////////////////////////////// -// Types -/////////////////////////////////////////////////////////////////////////// - -sealed trait Rql2Type extends Type with Rql2Node - -sealed trait Rql2TypeProperty extends Rql2Node -final case class Rql2IsNullableTypeProperty() extends Rql2TypeProperty -final case class Rql2IsTryableTypeProperty() extends Rql2TypeProperty - -/** - * A subset of RQL2 types have type properties. - */ -sealed trait Rql2TypeWithProperties extends Rql2Type { - def props: Set[Rql2TypeProperty] - def cloneAndAddProp(p: Rql2TypeProperty): Type - def cloneAndRemoveProp(p: Rql2TypeProperty): Type -} - -final case class Rql2UndefinedType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2TypeWithProperties { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2UndefinedType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2UndefinedType(props - p) -} - -/** - * Primitive types - */ -sealed trait Rql2PrimitiveType extends Rql2TypeWithProperties - -final case class Rql2BoolType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2PrimitiveType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2BoolType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2BoolType(props - p) -} - -final case class Rql2StringType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2PrimitiveType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2StringType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2StringType(props - p) -} - -final case class Rql2LocationType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2PrimitiveType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2LocationType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2LocationType(props - p) -} - -final case class Rql2BinaryType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2PrimitiveType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2BinaryType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2BinaryType(props - p) -} - -/** - * Number types - * - * These are also primitive types. - */ -sealed trait Rql2NumberType extends Rql2PrimitiveType - -sealed trait Rql2IntegralNumberType extends Rql2NumberType - -final case class Rql2ByteType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2IntegralNumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2ByteType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2ByteType(props - p) -} - -final case class Rql2ShortType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2IntegralNumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2ShortType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2ShortType(props - p) -} - -final case class Rql2IntType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2IntegralNumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2IntType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2IntType(props - p) -} - -final case class Rql2LongType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2IntegralNumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2LongType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2LongType(props - p) -} - -final case class Rql2FloatType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2NumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2FloatType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2FloatType(props - p) -} - -final case class Rql2DoubleType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2NumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2DoubleType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2DoubleType(props - p) -} - -final case class Rql2DecimalType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2NumberType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2DecimalType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2DecimalType(props - p) -} - -/** - * Temporal types - * - * These are also primitive types. - */ -sealed trait Rql2TemporalType extends Rql2PrimitiveType - -final case class Rql2DateType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2TemporalType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2DateType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2DateType(props - p) -} - -final case class Rql2TimeType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2TemporalType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2TimeType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2TimeType(props - p) -} - -final case class Rql2TimestampType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2TemporalType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2TimestampType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2TimestampType(props - p) -} - -final case class Rql2IntervalType(props: Set[Rql2TypeProperty] = Set.empty) extends Rql2TemporalType { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2IntervalType(props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2IntervalType(props - p) -} - -/** - * Record Type - */ -final case class Rql2RecordType(atts: Vector[Rql2AttrType], props: Set[Rql2TypeProperty] = Set.empty) - extends Rql2TypeWithProperties { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2RecordType(atts, props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2RecordType(atts, props - p) -} -final case class Rql2AttrType(idn: String, tipe: Type) extends Rql2Node - -/** - * Iterable Type - */ -final case class Rql2IterableType(innerType: Type, props: Set[Rql2TypeProperty] = Set.empty) - extends Rql2TypeWithProperties { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2IterableType(innerType, props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2IterableType(innerType, props - p) -} - -/** - * List Type - * - * Inherits from IterableType but provides index operations. - */ -final case class Rql2ListType(innerType: Type, props: Set[Rql2TypeProperty] = Set.empty) - extends Rql2TypeWithProperties { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2ListType(innerType, props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2ListType(innerType, props - p) -} - -/** - * Function Type. - */ -final case class FunType( - ms: Vector[Type], - os: Vector[FunOptTypeParam], - r: Type, - props: Set[Rql2TypeProperty] = Set.empty -) extends Rql2TypeWithProperties { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = FunType(ms, os, r, props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = FunType(ms, os, r, props - p) -} -final case class FunOptTypeParam(i: String, t: Type) extends Rql2Node - -/** - * Or Type. - */ -final case class Rql2OrType(tipes: Vector[Type], props: Set[Rql2TypeProperty] = Set.empty) - extends Rql2TypeWithProperties { - override def cloneAndAddProp(p: Rql2TypeProperty): Type = Rql2OrType(tipes, props + p) - override def cloneAndRemoveProp(p: Rql2TypeProperty): Type = Rql2OrType(tipes, props - p) -} - -object Rql2OrType { - def apply(t1: Type, t2: Type, props: Set[Rql2TypeProperty]): Rql2OrType = { - (t1, t2) match { - case (Rql2OrType(tipes1, props1), Rql2OrType(tipes2, props2)) if props == props1 && props == props2 => - Rql2OrType(tipes1 ++ tipes2, props) - case (Rql2OrType(tipes1, props1), _) if props == props1 => Rql2OrType(tipes1 :+ t2, props) - case (_, Rql2OrType(tipes2, props2)) if props == props2 => Rql2OrType(Vector(t1) ++ tipes2, props) - case _ => Rql2OrType(Vector(t1, t2), props) - } - } -} - -/** - * Package Type. - */ -final case class PackageType(name: String) extends Rql2Type -final case class PackageEntryType(pkgName: String, entName: String) extends Rql2Type - -/** - * Type Alias. - */ -final case class TypeAliasType(idn: IdnUse) extends Rql2Type - -/** - * Expression Type. - * - * The type of an expression such as `type int`. - */ -final case class ExpType(t: Type) extends Rql2Type - -/////////////////////////////////////////////////////////////////////////// -// Type Constraints -/////////////////////////////////////////////////////////////////////////// - -sealed trait Rql2TypeConstraint extends Rql2Type - -final case class ExpectedProjType(i: String) extends Rql2TypeConstraint - -final case class MergeableType(t: Type) extends Rql2TypeConstraint - -final case class HasTypeProperties(props: Set[Rql2TypeProperty]) extends Rql2TypeConstraint - -final case class IsTryable() extends Rql2TypeConstraint - -final case class IsNullable() extends Rql2TypeConstraint - -final case class DoesNotHaveTypeProperties(props: Set[Rql2TypeProperty]) extends Rql2TypeConstraint - -/////////////////////////////////////////////////////////////////////////// -// Expressions -/////////////////////////////////////////////////////////////////////////// - -sealed trait Rql2Exp extends Exp with Rql2Node - -/** - * Constants - */ - -trait Const extends Rql2Exp - -final case class NullConst() extends Const - -final case class BoolConst(value: Boolean) extends Const - -final case class StringConst(value: String) extends Const - -final case class TripleQuotedStringConst(value: String) extends Const - -final case class BinaryConst(bytes: Array[Byte]) extends Const { - override def equals(obj: Any): Boolean = { - obj match { - case BinaryConst(otherBytes) => bytes.sameElements(otherBytes) - case _ => false - } - } -} - -final case class LocationConst(bytes: Array[Byte], publicDescription: String) extends Const - -/** - * Number Constants - */ -trait NumberConst extends Const - -final case class ByteConst(value: String) extends NumberConst - -final case class ShortConst(value: String) extends NumberConst - -final case class IntConst(value: String) extends NumberConst - -final case class LongConst(value: String) extends NumberConst - -final case class FloatConst(value: String) extends NumberConst - -final case class DoubleConst(value: String) extends NumberConst - -final case class DecimalConst(value: String) extends NumberConst - -/** - * Type Expression - */ -final case class TypeExp(t: Type) extends Rql2Exp - -/** - * Let - */ - -final case class Let(decls: Vector[LetDecl], e: Exp) extends Rql2Exp - -sealed abstract class LetDecl extends Rql2Node -final case class LetBind(e: Exp, i: IdnDef, t: Option[Type]) extends LetDecl -final case class LetFun(p: FunProto, i: IdnDef) extends LetDecl -final case class LetFunRec(i: IdnDef, p: FunProto) extends LetDecl - -final case class FunProto(ps: Vector[FunParam], r: Option[Type], b: FunBody) extends Rql2Node - -final case class FunParam(i: IdnDef, t: Option[Type], e: Option[Exp]) extends Rql2Node - -// Body of function (defined as a separate node to have a separate scope). -final case class FunBody(e: Exp) extends Rql2Node - -/** - * Function Abstraction - */ - -final case class FunAbs(p: FunProto) extends Rql2Exp - -/** - * Function Application - */ - -final case class FunApp(f: Exp, args: Vector[FunAppArg]) extends Rql2Exp - -final case class FunAppArg(e: Exp, idn: Option[String]) extends Rql2Node - -/** - * Projection - */ - -final case class Proj(e: Exp, i: String) extends Rql2Exp - -/** - * Unary Operators - */ - -final case class UnaryExp(unaryOp: UnaryOp, exp: Exp) extends Rql2Exp with PrettyUnaryExpression { - override def op: String = unaryOp.op - override def priority: Int = unaryOp.priority - override def fixity: Fixity = unaryOp.fixity -} - -sealed abstract class UnaryOp(val op: String, val priority: Int) extends Rql2Node { - def fixity = Prefix -} - -final case class Not() extends UnaryOp("not", 2) - -final case class Neg() extends UnaryOp("-", 2) - -/** - * Binary Operators - */ -final case class BinaryExp(binaryOp: BinaryOp, left: Exp, right: Exp) extends Rql2Exp with PrettyBinaryExpression { - override def op: String = binaryOp.op - override def priority: Int = binaryOp.priority - override def fixity: Fixity = binaryOp.fixity -} - -sealed abstract class BinaryOp(val op: String, val priority: Int) extends Rql2Node { - def fixity = Infix(LeftAssoc) -} - -final case class Plus() extends BinaryOp("+", 5) - -final case class Sub() extends BinaryOp("-", 5) - -final case class Mult() extends BinaryOp("*", 4) - -final case class Div() extends BinaryOp("/", 4) - -final case class Mod() extends BinaryOp("%", 4) - -sealed abstract class ComparableOp(op: String, priority: Int) extends BinaryOp(op, priority) - -final case class Ge() extends ComparableOp(">=", 7) - -final case class Gt() extends ComparableOp(">", 7) - -final case class Le() extends ComparableOp("<=", 7) - -final case class Lt() extends ComparableOp("<", 7) - -final case class Eq() extends ComparableOp("==", 8) - -final case class Neq() extends ComparableOp("!=", 8) - -sealed abstract class BooleanOp(op: String, priority: Int) extends BinaryOp(op, priority) - -final case class And() extends BooleanOp("and", 12) - -final case class Or() extends BooleanOp("or", 13) - -/** - * Tertiary Operators - */ - -final case class IfThenElse(e1: Exp, e2: Exp, e3: Exp) extends Rql2Exp - -/** - * PackageIdnExp - * - * Used to refer to built-in package names. - */ -final case class PackageIdnExp(name: String) extends Rql2Exp diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/CommonSemanticAnalyzer.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/CommonSemanticAnalyzer.scala index 5fc82c7be..644e25067 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/CommonSemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/CommonSemanticAnalyzer.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import org.bitbucket.inkytonik.kiama.==> import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ @@ -19,7 +19,7 @@ import com.rawlabs.snapi.frontend.base.{MultipleEntity, TreeDescription, Unknown import com.rawlabs.snapi.frontend.base import com.rawlabs.snapi.frontend.base.source._ import com.rawlabs.snapi.frontend.base.errors._ -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import scala.collection.mutable diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/FrontendSyntaxAnalyzer.scala similarity index 81% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/FrontendSyntaxAnalyzer.scala index 64633c48e..f89ab5205 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/FrontendSyntaxAnalyzer.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import org.bitbucket.inkytonik.kiama.parsing._ import org.bitbucket.inkytonik.kiama.util.Positions import com.rawlabs.snapi.frontend.base.SyntaxAnalyzer.identRegex import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.snapi.source._ import scala.util.matching.Regex @@ -102,9 +102,11 @@ class FrontendSyntaxAnalyzer(val positions: Positions) // Program vs Package /////////////////////////////////////////////////////////////////////////// - override lazy val program: Parser[BaseProgram] = rep(rql2Method) ~ opt(exp) ^^ { case ms ~ me => Rql2Program(ms, me) } + override lazy val program: Parser[BaseProgram] = rep(snapiMethod) ~ opt(exp) ^^ { + case ms ~ me => SnapiProgram(ms, me) + } - final protected lazy val rql2Method: Parser[Rql2Method] = idnDef ~ funProto ^^ { case i ~ p => Rql2Method(p, i) } + final protected lazy val snapiMethod: Parser[SnapiMethod] = idnDef ~ funProto ^^ { case i ~ p => SnapiMethod(p, i) } /////////////////////////////////////////////////////////////////////////// // Types @@ -117,7 +119,7 @@ class FrontendSyntaxAnalyzer(val positions: Positions) } | tipe2 protected lazy val tipe2: PackratParser[Type] = tipe2 ~ (tokOr ~> baseType) ^^ { - case t1 ~ t2 => Rql2OrType(t1, t2, defaultProps) + case t1 ~ t2 => SnapiOrType(t1, t2, defaultProps) } | baseType protected def baseType: Parser[Type] = baseTypeAttr @@ -134,54 +136,54 @@ class FrontendSyntaxAnalyzer(val positions: Positions) typeAliasType | "(" ~> tipe <~ ")" - final protected lazy val primitiveType: Parser[Rql2PrimitiveType] = + final protected lazy val primitiveType: Parser[SnapiPrimitiveType] = boolType | stringType | locationType | binaryType | numberType | temporalType - final protected lazy val boolType: Parser[Rql2BoolType] = tokBool ^^^ Rql2BoolType(defaultProps) + final protected lazy val boolType: Parser[SnapiBoolType] = tokBool ^^^ SnapiBoolType(defaultProps) - final protected lazy val stringType: Parser[Rql2StringType] = tokString ^^^ Rql2StringType(defaultProps) + final protected lazy val stringType: Parser[SnapiStringType] = tokString ^^^ SnapiStringType(defaultProps) - final protected lazy val locationType: Parser[Rql2LocationType] = tokLocation ^^^ Rql2LocationType(defaultProps) + final protected lazy val locationType: Parser[SnapiLocationType] = tokLocation ^^^ SnapiLocationType(defaultProps) - final protected lazy val binaryType: Parser[Rql2BinaryType] = tokBinary ^^^ Rql2BinaryType(defaultProps) + final protected lazy val binaryType: Parser[SnapiBinaryType] = tokBinary ^^^ SnapiBinaryType(defaultProps) - final protected lazy val numberType: Parser[Rql2NumberType] = + final protected lazy val numberType: Parser[SnapiNumberType] = byteType | shortType | intType | longType | floatType | doubleType | decimalType - final protected lazy val byteType: Parser[Rql2ByteType] = tokByte ^^^ Rql2ByteType(defaultProps) + final protected lazy val byteType: Parser[SnapiByteType] = tokByte ^^^ SnapiByteType(defaultProps) - final protected lazy val shortType: Parser[Rql2ShortType] = tokShort ^^^ Rql2ShortType(defaultProps) + final protected lazy val shortType: Parser[SnapiShortType] = tokShort ^^^ SnapiShortType(defaultProps) - final protected lazy val intType: Parser[Rql2IntType] = tokInt ^^^ Rql2IntType(defaultProps) + final protected lazy val intType: Parser[SnapiIntType] = tokInt ^^^ SnapiIntType(defaultProps) - final protected lazy val longType: Parser[Rql2LongType] = tokLong ^^^ Rql2LongType(defaultProps) + final protected lazy val longType: Parser[SnapiLongType] = tokLong ^^^ SnapiLongType(defaultProps) - final protected lazy val floatType: Parser[Rql2FloatType] = tokFloat ^^^ Rql2FloatType(defaultProps) + final protected lazy val floatType: Parser[SnapiFloatType] = tokFloat ^^^ SnapiFloatType(defaultProps) - final protected lazy val doubleType: Parser[Rql2DoubleType] = tokDouble ^^^ Rql2DoubleType(defaultProps) + final protected lazy val doubleType: Parser[SnapiDoubleType] = tokDouble ^^^ SnapiDoubleType(defaultProps) - final protected lazy val decimalType: Parser[Rql2DecimalType] = tokDecimal ^^^ Rql2DecimalType(defaultProps) + final protected lazy val decimalType: Parser[SnapiDecimalType] = tokDecimal ^^^ SnapiDecimalType(defaultProps) - final protected lazy val temporalType: Parser[Rql2TemporalType] = dateType | timeType | intervalType | timestampType + final protected lazy val temporalType: Parser[SnapiTemporalType] = dateType | timeType | intervalType | timestampType - final protected lazy val dateType: Parser[Rql2DateType] = tokDate ^^^ Rql2DateType(defaultProps) + final protected lazy val dateType: Parser[SnapiDateType] = tokDate ^^^ SnapiDateType(defaultProps) - final protected lazy val timeType: Parser[Rql2TimeType] = tokTime ^^^ Rql2TimeType(defaultProps) + final protected lazy val timeType: Parser[SnapiTimeType] = tokTime ^^^ SnapiTimeType(defaultProps) - final protected lazy val intervalType: Parser[Rql2IntervalType] = tokInterval ^^^ Rql2IntervalType(defaultProps) + final protected lazy val intervalType: Parser[SnapiIntervalType] = tokInterval ^^^ SnapiIntervalType(defaultProps) - final protected lazy val timestampType: Parser[Rql2TimestampType] = tokTimestamp ^^^ Rql2TimestampType(defaultProps) + final protected lazy val timestampType: Parser[SnapiTimestampType] = tokTimestamp ^^^ SnapiTimestampType(defaultProps) - final protected lazy val recordType: Parser[Rql2RecordType] = - tokRecord ~> ("(" ~> repsep(attrType, ",") <~ opt(",") <~ ")") ^^ (atts => Rql2RecordType(atts, defaultProps)) + final protected lazy val recordType: Parser[SnapiRecordType] = + tokRecord ~> ("(" ~> repsep(attrType, ",") <~ opt(",") <~ ")") ^^ (atts => SnapiRecordType(atts, defaultProps)) - final protected lazy val attrType: Parser[Rql2AttrType] = (ident <~ ":") ~ tipe ^^ Rql2AttrType + final protected lazy val attrType: Parser[SnapiAttrType] = (ident <~ ":") ~ tipe ^^ SnapiAttrType - final protected lazy val iterableType: Parser[Rql2IterableType] = - tokCollection ~> ("(" ~> tipe <~ ")") ^^ (t => Rql2IterableType(t, defaultProps)) + final protected lazy val iterableType: Parser[SnapiIterableType] = + tokCollection ~> ("(" ~> tipe <~ ")") ^^ (t => SnapiIterableType(t, defaultProps)) - final protected lazy val listType: Parser[Rql2ListType] = tokList ~> ("(" ~> tipe <~ ")") ^^ { - case t => Rql2ListType(t, defaultProps) + final protected lazy val listType: Parser[SnapiListType] = tokList ~> ("(" ~> tipe <~ ")") ^^ { + case t => SnapiListType(t, defaultProps) } final protected lazy val funType: PackratParser[FunType] = { @@ -205,7 +207,7 @@ class FrontendSyntaxAnalyzer(val positions: Positions) final protected lazy val expType: Parser[ExpType] = tokType ~> tipe ^^ ExpType - final protected lazy val undefinedType: Parser[Rql2UndefinedType] = tokUndefined ^^^ Rql2UndefinedType(defaultProps) + final protected lazy val undefinedType: Parser[SnapiUndefinedType] = tokUndefined ^^^ SnapiUndefinedType(defaultProps) final protected lazy val typeAliasType: Parser[TypeAliasType] = typeIdnUse ^^ TypeAliasType @@ -215,7 +217,7 @@ class FrontendSyntaxAnalyzer(val positions: Positions) if (isReservedType(idn)) failure("reserved type keyword") else success(idn) } - private val defaultProps: Set[Rql2TypeProperty] = Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()) + private val defaultProps: Set[SnapiTypeProperty] = Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()) /////////////////////////////////////////////////////////////////////////// // Expressions diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Keywords.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Keywords.scala similarity index 97% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Keywords.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Keywords.scala index 5f93e9af8..e0da8c448 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Keywords.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Keywords.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.rawlabs.snapi.frontend.base diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/LspAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/LspAnalyzer.scala similarity index 95% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/LspAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/LspAnalyzer.scala index 12c5a5756..03ec16f07 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/LspAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/LspAnalyzer.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.rawlabs.compiler.{ AutoCompleteResponse, @@ -38,8 +38,8 @@ import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} import com.rawlabs.snapi.frontend.base.errors.CompilationMessageMapper import com.rawlabs.snapi.frontend.base.source.{BaseIdnNode, BaseNode} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.errors.ErrorsPrettyPrinter +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.errors.ErrorsPrettyPrinter import scala.util.Try @@ -143,12 +143,12 @@ class LspAnalyzer( maybeNode match { case Some(LetBind(_, _, Some(ErrorType()))) | Some(FunParam(IdnDef(_), Some(ErrorType()), None)) | Some( LetBind(_, _, Some(TypeAliasType(_))) - ) | Some(Rql2AttrType(_, ErrorType())) | Some(TypeExp(ErrorType())) | Some(TypeAliasType(_)) => + ) | Some(SnapiAttrType(_, ErrorType())) | Some(TypeExp(ErrorType())) | Some(TypeAliasType(_)) => val allTypes = getAllTypesInScope(maybeNode, prefix) AutoCompleteResponse(allTypes) case _ => // Given that node, ask the "chain" for all entries in scope. nodeAtCurrentPosition match { - case Some(Rql2ListType(ErrorType(), _)) => + case Some(SnapiListType(ErrorType(), _)) => val allTypes = getAllTypesInScope(maybeNode, prefix) AutoCompleteResponse(allTypes) case _ => @@ -232,7 +232,7 @@ class LspAnalyzer( .sortBy { e: Exp => positions.textOf(e).get.length } .collectFirst { case e: Exp => analyzer.tipe(e) match { - case Rql2RecordType(atts, _) => atts.map { a => + case SnapiRecordType(atts, _) => atts.map { a => FieldCompletion( SourcePrettyPrinter.ident(a.idn), SourcePrettyPrinter.format(a.tipe) @@ -251,16 +251,16 @@ class LspAnalyzer( val docs = pkg.getEntry(e).docs PackageEntryCompletion(e, docs) } - case Rql2ListType(Rql2RecordType(atts, _), _) => atts.map(a => + case SnapiListType(SnapiRecordType(atts, _), _) => atts.map(a => FieldCompletion( SourcePrettyPrinter.ident(a.idn), - SourcePrettyPrinter.format(Rql2ListType(a.tipe)) + SourcePrettyPrinter.format(SnapiListType(a.tipe)) ) ) - case Rql2IterableType(Rql2RecordType(atts, _), _) => atts.map { a => + case SnapiIterableType(SnapiRecordType(atts, _), _) => atts.map { a => FieldCompletion( SourcePrettyPrinter.ident(a.idn), - SourcePrettyPrinter.format(Rql2IterableType(a.tipe)) + SourcePrettyPrinter.format(SnapiIterableType(a.tipe)) ) } case _ => Seq.empty[Completion] @@ -306,7 +306,7 @@ class LspAnalyzer( val LetFun(p, i) = letFunEntity.f HoverResponse(Some(TypeCompletion(i.idn, getFunctionSignature(i, p)))) case methodEntity: MethodEntity => //gets here - val Rql2Method(p, i) = methodEntity.d + val SnapiMethod(p, i) = methodEntity.d HoverResponse(Some(TypeCompletion(i.idn, getFunctionSignature(i, p)))) case letFunRecEntity: LetFunRecEntity => //gets here val LetFunRec(i, p) = letFunRecEntity.f @@ -317,7 +317,7 @@ class LspAnalyzer( case _ => HoverResponse(None) } case Proj(e, i) => analyzer.actualType(e) match { //gets here - case Rql2RecordType(atts, _) => + case SnapiRecordType(atts, _) => val att = atts.find(a => a.idn == i) if (att.isDefined) HoverResponse(Some(TypeCompletion(i, SourcePrettyPrinter.format(att.get.tipe)))) else HoverResponse(None) @@ -332,7 +332,7 @@ class LspAnalyzer( case _ => HoverResponse(None) } // for debugging - // case rql2Node: Rql2Node => rql2Node + // case snapiNode: SnapiNode => snapiNode } res match { @@ -398,7 +398,7 @@ class LspAnalyzer( val pos = positions.getStart(i) GoToDefinitionResponse(Some(Pos(pos.get.line, pos.get.column))) case methodEntity: MethodEntity => - val Rql2Method(p, i) = methodEntity.d + val SnapiMethod(p, i) = methodEntity.d val pos = positions.getStart(i) GoToDefinitionResponse(Some(Pos(pos.get.line, pos.get.column))) case letFunRecEntity: LetFunRecEntity => @@ -408,7 +408,7 @@ class LspAnalyzer( case _ => GoToDefinitionResponse(None) } case Proj(e, i) => analyzer.actualType(e) match { - case Rql2RecordType(atts, _) => + case SnapiRecordType(atts, _) => val posRes = for { att <- atts.find(a => a.idn == i) pos <- positions.getStart(att.idn) @@ -420,7 +420,7 @@ class LspAnalyzer( case _ => GoToDefinitionResponse(None) } // for debugging - // case rql2Node: Rql2Node => rql2Node + // case snapiNode: SnapiNode => snapiNode } res match { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PhaseDescriptor.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/PhaseDescriptor.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PhaseDescriptor.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/PhaseDescriptor.scala index 07d2cb0ed..3c1924e0e 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PhaseDescriptor.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/PhaseDescriptor.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ final case class PhaseDescriptor( name: String, diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/PipelinedPhase.scala similarity index 94% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/PipelinedPhase.scala index ad97eef6b..bee440aca 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/PipelinedPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/PipelinedPhase.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source.SourceProgram +import com.rawlabs.snapi.frontend.snapi.source.SourceProgram trait PipelinedPhase extends com.rawlabs.snapi.frontend.base.PipelinedPhase[SourceProgram] diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/ProgramContext.scala similarity index 79% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/ProgramContext.scala index 31f37f826..2a15156f7 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/ProgramContext.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/ProgramContext.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.rawlabs.compiler.ProgramEnvironment import com.rawlabs.snapi.frontend.base.CompilerContext import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage -import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, PackageExtensionProvider} -import com.rawlabs.snapi.frontend.rql2.source.Rql2Program +import com.rawlabs.snapi.frontend.snapi.extensions.{PackageExtension, PackageExtensionProvider} +import com.rawlabs.snapi.frontend.snapi.source.SnapiProgram import com.rawlabs.snapi.frontend.inferrer.api.{InferrerInput, InferrerOutput} import scala.collection.mutable @@ -30,7 +30,7 @@ class ProgramContext( private val dynamicPackageCache = new mutable.HashMap[String, PackageExtension] - private val stageCompilerCache = new mutable.HashMap[Rql2Program, Either[ErrorCompilerMessage, Rql2Value]] + private val stageCompilerCache = new mutable.HashMap[SnapiProgram, Either[ErrorCompilerMessage, SnapiValue]] def infer( inferrerProperties: InferrerInput @@ -50,9 +50,9 @@ class ProgramContext( } def getOrAddStagedCompilation( - program: Rql2Program, - f: => Either[ErrorCompilerMessage, Rql2Value] - ): Either[ErrorCompilerMessage, Rql2Value] = { + program: SnapiProgram, + f: => Either[ErrorCompilerMessage, SnapiValue] + ): Either[ErrorCompilerMessage, SnapiValue] = { stageCompilerCache.getOrElseUpdate(program, f) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Rql2Values.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Rql2Values.scala new file mode 100644 index 000000000..4bcebbde7 --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Rql2Values.scala @@ -0,0 +1,47 @@ +/* + * Copyright 2023 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.snapi + +import com.rawlabs.utils.sources.api.Location + +sealed trait SnapiValue +final case class SnapiStringValue(v: String) extends SnapiValue +final case class SnapiBoolValue(v: Boolean) extends SnapiValue +final case class SnapiBinaryValue(v: Array[Byte]) extends SnapiValue +final case class SnapiByteValue(v: Byte) extends SnapiValue +final case class SnapiShortValue(v: Short) extends SnapiValue +final case class SnapiIntValue(v: Int) extends SnapiValue +final case class SnapiLongValue(v: Long) extends SnapiValue +final case class SnapiFloatValue(v: Float) extends SnapiValue +final case class SnapiDoubleValue(v: Double) extends SnapiValue +final case class SnapiDecimalValue(v: BigDecimal) extends SnapiValue +final case class SnapiDateValue(v: java.time.LocalDate) extends SnapiValue +final case class SnapiTimeValue(v: java.time.LocalTime) extends SnapiValue +final case class SnapiTimestampValue(v: java.time.LocalDateTime) extends SnapiValue +final case class SnapiIntervalValue( + years: Int, + months: Int, + weeks: Int, + days: Int, + hours: Int, + minutes: Int, + seconds: Int, + millis: Int +) extends SnapiValue +final case class SnapiLocationValue(l: Location, publicDescription: String) extends SnapiValue +final case class SnapiRecordValue(v: Seq[SnapiRecordAttr]) extends SnapiValue +final case class SnapiRecordAttr(name: String, value: SnapiValue) +final case class SnapiTryValue(v: Either[String, SnapiValue]) extends SnapiValue +final case class SnapiOptionValue(v: Option[SnapiValue]) extends SnapiValue +final case class SnapiListValue(v: Seq[SnapiValue]) extends SnapiValue +final case class SnapiIterableValue(v: Seq[SnapiValue]) extends SnapiValue // Data has been ready is now materialized. diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SemanticAnalyzer.scala similarity index 82% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SemanticAnalyzer.scala index 418cfb872..ff05d66e9 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SemanticAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SemanticAnalyzer.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.typesafe.scalalogging.StrictLogging import org.bitbucket.inkytonik.kiama.==> @@ -19,8 +19,8 @@ import org.bitbucket.inkytonik.kiama.util.Entity import com.rawlabs.snapi.frontend.base._ import com.rawlabs.snapi.frontend.base.errors._ import com.rawlabs.snapi.frontend.base.source._ -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -31,7 +31,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.errors.{ +import com.rawlabs.snapi.frontend.snapi.errors.{ CannotDetermineTypeOfParameter, ExpectedTypeButGotExpression, FailedToEvaluate, @@ -48,8 +48,8 @@ import com.rawlabs.snapi.frontend.rql2.errors.{ UnexpectedArguments, UnexpectedOptionalArgument } -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypePackageBuilder -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TypePackageBuilder +import com.rawlabs.snapi.frontend.snapi.source._ import scala.collection.mutable import scala.util.control.NonFatal @@ -58,7 +58,7 @@ case class FunAppPackageEntryArguments( mandatoryArgs: Seq[Arg], optionalArgs: Vector[(String, Arg)], varArgs: Seq[Arg], - extraProps: Set[Rql2TypeProperty] + extraProps: Set[SnapiTypeProperty] ) final private class MergeTypeException extends Exception @@ -74,17 +74,18 @@ final case class CompatibilityReport(t: Type, effective: Type) { // hit when consuming the iterable. This is then up to the consumer to protect itself from the error. An iterable consumer // should always handle a possible unexpected null/error because it's the one consuming. It can type as an try itself // in order to propagate the error, or handle it in some way. - def extraProps: Set[Rql2TypeProperty] = { + def extraProps: Set[SnapiTypeProperty] = { - def recurse(target: Type, effective: Type): Set[Rql2TypeProperty] = (target, effective) match { - case (Rql2ListType(inner1, props1), Rql2ListType(inner2, props2)) => recurse(inner1, inner2) ++ (props2 &~ props1) - case (Rql2IterableType(inner1, props1), Rql2IterableType(inner2, props2)) => (props2 &~ props1) - case (Rql2RecordType(atts1, props1), Rql2RecordType(atts2, props2)) => + def recurse(target: Type, effective: Type): Set[SnapiTypeProperty] = (target, effective) match { + case (SnapiListType(inner1, props1), SnapiListType(inner2, props2)) => + recurse(inner1, inner2) ++ (props2 &~ props1) + case (SnapiIterableType(inner1, props1), SnapiIterableType(inner2, props2)) => (props2 &~ props1) + case (SnapiRecordType(atts1, props1), SnapiRecordType(atts2, props2)) => val tipes1 = atts1.map(_.tipe) val tipes2 = atts2.map(_.tipe) assert(tipes1.size == tipes2.size) tipes1.zip(tipes2).flatMap { case (t1, t2) => recurse(t1, t2) }.toSet ++ (props2 &~ props1) - case (t1: Rql2TypeWithProperties, t2: Rql2TypeWithProperties) => t2.props &~ t1.props + case (t1: SnapiTypeWithProperties, t2: SnapiTypeWithProperties) => t2.props &~ t1.props case (_: PackageEntryType, _: PackageEntryType) => Set.empty case (_: PackageType, _: PackageType) => Set.empty case _ => Set.empty @@ -103,16 +104,16 @@ final case class CompatibilityReport(t: Type, effective: Type) { def castNeeded: Boolean = { def recurse(target: Type, effective: Type): Boolean = (target, effective) match { - case (Rql2ListType(inner1, props1), Rql2ListType(inner2, props2)) => + case (SnapiListType(inner1, props1), SnapiListType(inner2, props2)) => recurse(inner1, inner2) || (props2 &~ props1).nonEmpty - case (Rql2IterableType(inner1, props1), Rql2IterableType(inner2, props2)) => + case (SnapiIterableType(inner1, props1), SnapiIterableType(inner2, props2)) => recurse(inner1, inner2) || (props2 &~ props1).nonEmpty - case (Rql2RecordType(atts1, props1), Rql2RecordType(atts2, props2)) => + case (SnapiRecordType(atts1, props1), SnapiRecordType(atts2, props2)) => val tipes1 = atts1.map(_.tipe) val tipes2 = atts2.map(_.tipe) assert(tipes1.size == tipes2.size) tipes1.zip(tipes2).exists { case (t1, t2) => recurse(t1, t2) } || (props2 &~ props1).nonEmpty - case (t1: Rql2TypeWithProperties, t2: Rql2TypeWithProperties) => (t2.props &~ t1.props).nonEmpty + case (t1: SnapiTypeWithProperties, t2: SnapiTypeWithProperties) => (t2.props &~ t1.props).nonEmpty case (_: PackageEntryType, _: PackageEntryType) => false case (_: PackageType, _: PackageType) => false case _ => false @@ -125,7 +126,7 @@ final case class CompatibilityReport(t: Type, effective: Type) { // Helper to merge types. // Does not handle PackageType or TypeAlias, since these are never exposed to Package extensions. -class TypesMerger extends Rql2TypeUtils with StrictLogging { +class TypesMerger extends SnapiTypeUtils with StrictLogging { final def isCompatible(actual: Type, expected: Type): Boolean = { getCompatibleType(actual, expected).isDefined @@ -139,23 +140,23 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { // For complex types (records, collections), get the inner types as merged and // wrap back, merging the properties (t1, t2) match { - case (Rql2RecordType(atts1, props1), Rql2RecordType(atts2, props2)) => + case (SnapiRecordType(atts1, props1), SnapiRecordType(atts2, props2)) => if (atts1.size != atts2.size) None else { val mergedAttrs = - atts1.zip(atts2).foldLeft(Some(Vector.empty[Rql2AttrType]): Option[Vector[Rql2AttrType]]) { - case (Some(atts), (Rql2AttrType(f1, i1), Rql2AttrType(f2, i2))) => + atts1.zip(atts2).foldLeft(Some(Vector.empty[SnapiAttrType]): Option[Vector[SnapiAttrType]]) { + case (Some(atts), (SnapiAttrType(f1, i1), SnapiAttrType(f2, i2))) => if (f1 == f2) { - merge(i1, i2).map(t => atts :+ Rql2AttrType(f1, t)) + merge(i1, i2).map(t => atts :+ SnapiAttrType(f1, t)) } else None case _ => None } - mergedAttrs.map(atts => Rql2RecordType(atts, props1 ++ props2)) + mergedAttrs.map(atts => SnapiRecordType(atts, props1 ++ props2)) } - case (Rql2ListType(i1, props1), Rql2ListType(i2, props2)) => - merge(i1, i2).map(t => Rql2ListType(t, props1 ++ props2)) - case (Rql2IterableType(i1, props1), Rql2IterableType(i2, props2)) => - merge(i1, i2).map(t => Rql2IterableType(t, props1 ++ props2)) + case (SnapiListType(i1, props1), SnapiListType(i2, props2)) => + merge(i1, i2).map(t => SnapiListType(t, props1 ++ props2)) + case (SnapiIterableType(i1, props1), SnapiIterableType(i2, props2)) => + merge(i1, i2).map(t => SnapiIterableType(t, props1 ++ props2)) case _ => // The merged type of two primitive types: // * Call getCompatibleType after having removed properties, _both ways_ @@ -187,11 +188,11 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { def propertyCompatible(actual: Type, expected: Type): Boolean = { assert(!isTypeConstraint(expected)) (actual, expected) match { - case (Rql2ListType(actualInner, actualProps), Rql2ListType(expectedInner, expectedProps)) => + case (SnapiListType(actualInner, actualProps), SnapiListType(expectedInner, expectedProps)) => expectedProps.subsetOf(actualProps) && propertyCompatible(actualInner, expectedInner) - case (Rql2IterableType(actualInner, actualProps), Rql2IterableType(expectedInner, expectedProps)) => + case (SnapiIterableType(actualInner, actualProps), SnapiIterableType(expectedInner, expectedProps)) => expectedProps.subsetOf(actualProps) && propertyCompatible(actualInner, expectedInner) - case (Rql2RecordType(actualAtts, actualProps), Rql2RecordType(expectedAtts, expectedProps)) => + case (SnapiRecordType(actualAtts, actualProps), SnapiRecordType(expectedAtts, expectedProps)) => // same field names, compatible properties and matching field types actualAtts.map(_.idn) == expectedAtts.map(_.idn) && (actualProps.intersect(expectedProps) == expectedProps) && actualAtts.map(_.tipe).zip(expectedAtts.map(_.tipe)).forall { @@ -214,7 +215,7 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { // if we expected the type to be tryable (of anything), the target is the actual type as tryable (possibly nullable) Some( CompatibilityReport( - addProp(actual, Rql2IsTryableTypeProperty()), + addProp(actual, SnapiIsTryableTypeProperty()), actual ) ) @@ -222,7 +223,7 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { // if we expected the type to be nullable (of anything), the target is the actual type as nullable, and _not tryable_ Some( CompatibilityReport( - resetProps(actual, Set(Rql2IsNullableTypeProperty())), + resetProps(actual, Set(SnapiIsNullableTypeProperty())), actual ) ) @@ -235,9 +236,9 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { case (_, OneOfType(expectedTypes)) => expectedTypes.flatMap(t => funParamTypeCompatibility(actual, t)).headOption case (_, MergeableType(target)) => mergeType(actual, target).map(m => CompatibilityReport(m, m)) // m - case (Rql2RecordType(as, _), ExpectedRecordType(idns)) if idns.subsetOf(as.map(_.idn).toSet) => + case (SnapiRecordType(as, _), ExpectedRecordType(idns)) if idns.subsetOf(as.map(_.idn).toSet) => Some(CompatibilityReport(resetProps(actual, Set.empty), actual)) - case (r: Rql2RecordType, e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => + case (r: SnapiRecordType, e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => Some(CompatibilityReport(actual, actual)) case (_, _: AnythingType) => Some(CompatibilityReport(actual, actual)) case _ => None @@ -245,22 +246,22 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { } else { try { (actual, expected) match { - case (Rql2ListType(actualItemType, actualProps), Rql2ListType(expectedItemType, expectedProps)) => + case (SnapiListType(actualItemType, actualProps), SnapiListType(expectedItemType, expectedProps)) => funParamTypeCompatibility(actualItemType, expectedItemType).map { report => CompatibilityReport( - Rql2ListType(report.t, expectedProps), - Rql2ListType(report.effective, actualProps) + SnapiListType(report.t, expectedProps), + SnapiListType(report.effective, actualProps) ) } - case (Rql2IterableType(actualItemType, actualProps), Rql2IterableType(expectedItemType, expectedProps)) => + case (SnapiIterableType(actualItemType, actualProps), SnapiIterableType(expectedItemType, expectedProps)) => val r = funParamTypeCompatibility(actualItemType, expectedItemType) r.map { report => CompatibilityReport( - Rql2IterableType(report.t, expectedProps), - Rql2IterableType(report.effective, actualProps) + SnapiIterableType(report.t, expectedProps), + SnapiIterableType(report.effective, actualProps) ) } - case (Rql2RecordType(actualAtts, actualProps), Rql2RecordType(expectedAtts, expectedProps)) => + case (SnapiRecordType(actualAtts, actualProps), SnapiRecordType(expectedAtts, expectedProps)) => if (actualAtts.size != expectedAtts.size || actualAtts.map(_.idn) != expectedAtts.map(_.idn)) None else { val actualTypes = actualAtts.map(_.tipe) @@ -269,12 +270,12 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { actualTypes.zip(expectedTypes).map { case (t1, t2) => funParamTypeCompatibility(t1, t2) } if (fieldChecks.forall(_.isDefined)) { val okChecks = fieldChecks.flatten - val effectiveFields = actualAtts.zip(okChecks).map { case (a, c) => Rql2AttrType(a.idn, c.effective) } - val targetFields = actualAtts.zip(okChecks).map { case (a, c) => Rql2AttrType(a.idn, c.t) } + val effectiveFields = actualAtts.zip(okChecks).map { case (a, c) => SnapiAttrType(a.idn, c.effective) } + val targetFields = actualAtts.zip(okChecks).map { case (a, c) => SnapiAttrType(a.idn, c.t) } Some( CompatibilityReport( - Rql2RecordType(targetFields, expectedProps), - Rql2RecordType(effectiveFields, actualProps) + SnapiRecordType(targetFields, expectedProps), + SnapiRecordType(effectiveFields, actualProps) ) ) } else None @@ -325,89 +326,89 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { @throws[MergeTypeException] protected def recurse(actual: Type, expected: Type): Type = (actual, expected) match { // Upcast to short - case (a: Rql2ByteType, e: Rql2ShortType) if a.props.subsetOf(e.props) => Rql2ShortType(e.props) + case (a: SnapiByteType, e: SnapiShortType) if a.props.subsetOf(e.props) => SnapiShortType(e.props) // Update to int - case (a: Rql2ByteType, e: Rql2IntType) if a.props.subsetOf(e.props) => Rql2IntType(e.props) - case (a: Rql2ShortType, e: Rql2IntType) if a.props.subsetOf(e.props) => Rql2IntType(e.props) + case (a: SnapiByteType, e: SnapiIntType) if a.props.subsetOf(e.props) => SnapiIntType(e.props) + case (a: SnapiShortType, e: SnapiIntType) if a.props.subsetOf(e.props) => SnapiIntType(e.props) // Upcast to long - case (a: Rql2ByteType, e: Rql2LongType) if a.props.subsetOf(e.props) => Rql2LongType(e.props) - case (a: Rql2ShortType, e: Rql2LongType) if a.props.subsetOf(e.props) => Rql2LongType(e.props) - case (a: Rql2IntType, e: Rql2LongType) if a.props.subsetOf(e.props) => Rql2LongType(e.props) + case (a: SnapiByteType, e: SnapiLongType) if a.props.subsetOf(e.props) => SnapiLongType(e.props) + case (a: SnapiShortType, e: SnapiLongType) if a.props.subsetOf(e.props) => SnapiLongType(e.props) + case (a: SnapiIntType, e: SnapiLongType) if a.props.subsetOf(e.props) => SnapiLongType(e.props) // Upcast to float - case (a: Rql2ByteType, e: Rql2FloatType) if a.props.subsetOf(e.props) => Rql2FloatType(e.props) - case (a: Rql2ShortType, e: Rql2FloatType) if a.props.subsetOf(e.props) => Rql2FloatType(e.props) - case (a: Rql2IntType, e: Rql2FloatType) if a.props.subsetOf(e.props) => Rql2FloatType(e.props) - case (a: Rql2LongType, e: Rql2FloatType) if a.props.subsetOf(e.props) => Rql2FloatType(e.props) + case (a: SnapiByteType, e: SnapiFloatType) if a.props.subsetOf(e.props) => SnapiFloatType(e.props) + case (a: SnapiShortType, e: SnapiFloatType) if a.props.subsetOf(e.props) => SnapiFloatType(e.props) + case (a: SnapiIntType, e: SnapiFloatType) if a.props.subsetOf(e.props) => SnapiFloatType(e.props) + case (a: SnapiLongType, e: SnapiFloatType) if a.props.subsetOf(e.props) => SnapiFloatType(e.props) // Upcast to double - case (a: Rql2ByteType, e: Rql2DoubleType) if a.props.subsetOf(e.props) => Rql2DoubleType(e.props) - case (a: Rql2ShortType, e: Rql2DoubleType) if a.props.subsetOf(e.props) => Rql2DoubleType(e.props) - case (a: Rql2IntType, e: Rql2DoubleType) if a.props.subsetOf(e.props) => Rql2DoubleType(e.props) - case (a: Rql2LongType, e: Rql2DoubleType) if a.props.subsetOf(e.props) => Rql2DoubleType(e.props) - case (a: Rql2FloatType, e: Rql2DoubleType) if a.props.subsetOf(e.props) => Rql2DoubleType(e.props) + case (a: SnapiByteType, e: SnapiDoubleType) if a.props.subsetOf(e.props) => SnapiDoubleType(e.props) + case (a: SnapiShortType, e: SnapiDoubleType) if a.props.subsetOf(e.props) => SnapiDoubleType(e.props) + case (a: SnapiIntType, e: SnapiDoubleType) if a.props.subsetOf(e.props) => SnapiDoubleType(e.props) + case (a: SnapiLongType, e: SnapiDoubleType) if a.props.subsetOf(e.props) => SnapiDoubleType(e.props) + case (a: SnapiFloatType, e: SnapiDoubleType) if a.props.subsetOf(e.props) => SnapiDoubleType(e.props) // Upcast do decimal - case (a: Rql2ByteType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) - case (a: Rql2ShortType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) - case (a: Rql2IntType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) - case (a: Rql2LongType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) - case (a: Rql2FloatType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) - case (a: Rql2DoubleType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) + case (a: SnapiByteType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) + case (a: SnapiShortType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) + case (a: SnapiIntType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) + case (a: SnapiLongType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) + case (a: SnapiFloatType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) + case (a: SnapiDoubleType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) // Upcast to timestamp - case (a: Rql2DateType, e: Rql2TimestampType) if a.props.subsetOf(e.props) => Rql2TimestampType(e.props) + case (a: SnapiDateType, e: SnapiTimestampType) if a.props.subsetOf(e.props) => SnapiTimestampType(e.props) // Upcast to location: a string can be used as a location type (without any properties) - case (a: Rql2StringType, e: Rql2LocationType) if a.props.subsetOf(e.props) => Rql2LocationType(e.props) + case (a: SnapiStringType, e: SnapiLocationType) if a.props.subsetOf(e.props) => SnapiLocationType(e.props) // Bool type - case (a: Rql2BoolType, e: Rql2BoolType) if a.props.subsetOf(e.props) => Rql2BoolType(e.props) + case (a: SnapiBoolType, e: SnapiBoolType) if a.props.subsetOf(e.props) => SnapiBoolType(e.props) // String type - case (a: Rql2StringType, e: Rql2StringType) if a.props.subsetOf(e.props) => Rql2StringType(e.props) + case (a: SnapiStringType, e: SnapiStringType) if a.props.subsetOf(e.props) => SnapiStringType(e.props) // Location type - case (a: Rql2LocationType, e: Rql2LocationType) if a.props.subsetOf(e.props) => Rql2LocationType(e.props) + case (a: SnapiLocationType, e: SnapiLocationType) if a.props.subsetOf(e.props) => SnapiLocationType(e.props) // Binary type - case (a: Rql2BinaryType, e: Rql2BinaryType) if a.props.subsetOf(e.props) => Rql2BinaryType(e.props) + case (a: SnapiBinaryType, e: SnapiBinaryType) if a.props.subsetOf(e.props) => SnapiBinaryType(e.props) // Byte type - case (a: Rql2ByteType, e: Rql2ByteType) if a.props.subsetOf(e.props) => Rql2ByteType(e.props) + case (a: SnapiByteType, e: SnapiByteType) if a.props.subsetOf(e.props) => SnapiByteType(e.props) // Short type - case (a: Rql2ShortType, e: Rql2ShortType) if a.props.subsetOf(e.props) => Rql2ShortType(e.props) + case (a: SnapiShortType, e: SnapiShortType) if a.props.subsetOf(e.props) => SnapiShortType(e.props) // Int type - case (a: Rql2IntType, e: Rql2IntType) if a.props.subsetOf(e.props) => Rql2IntType(e.props) + case (a: SnapiIntType, e: SnapiIntType) if a.props.subsetOf(e.props) => SnapiIntType(e.props) // Long type - case (a: Rql2LongType, e: Rql2LongType) if a.props.subsetOf(e.props) => Rql2LongType(e.props) + case (a: SnapiLongType, e: SnapiLongType) if a.props.subsetOf(e.props) => SnapiLongType(e.props) // Float type - case (a: Rql2FloatType, e: Rql2FloatType) if a.props.subsetOf(e.props) => Rql2FloatType(e.props) + case (a: SnapiFloatType, e: SnapiFloatType) if a.props.subsetOf(e.props) => SnapiFloatType(e.props) // Double type - case (a: Rql2DoubleType, e: Rql2DoubleType) if a.props.subsetOf(e.props) => Rql2DoubleType(e.props) + case (a: SnapiDoubleType, e: SnapiDoubleType) if a.props.subsetOf(e.props) => SnapiDoubleType(e.props) // Decimal type - case (a: Rql2DecimalType, e: Rql2DecimalType) if a.props.subsetOf(e.props) => Rql2DecimalType(e.props) + case (a: SnapiDecimalType, e: SnapiDecimalType) if a.props.subsetOf(e.props) => SnapiDecimalType(e.props) // Date type - case (a: Rql2DateType, e: Rql2DateType) if a.props.subsetOf(e.props) => Rql2DateType(e.props) + case (a: SnapiDateType, e: SnapiDateType) if a.props.subsetOf(e.props) => SnapiDateType(e.props) // Time type - case (a: Rql2TimeType, e: Rql2TimeType) if a.props.subsetOf(e.props) => Rql2TimeType(e.props) + case (a: SnapiTimeType, e: SnapiTimeType) if a.props.subsetOf(e.props) => SnapiTimeType(e.props) // Timestamp type - case (a: Rql2TimestampType, e: Rql2TimestampType) if a.props.subsetOf(e.props) => Rql2TimestampType(e.props) + case (a: SnapiTimestampType, e: SnapiTimestampType) if a.props.subsetOf(e.props) => SnapiTimestampType(e.props) // Interval type - case (a: Rql2IntervalType, e: Rql2IntervalType) if a.props.subsetOf(e.props) => Rql2IntervalType(e.props) + case (a: SnapiIntervalType, e: SnapiIntervalType) if a.props.subsetOf(e.props) => SnapiIntervalType(e.props) // Record Type - case (a: Rql2RecordType, e: Rql2RecordType) + case (a: SnapiRecordType, e: SnapiRecordType) if a.atts.map(_.idn) == e.atts.map(_.idn) && a.props.subsetOf(e.props) => - Rql2RecordType( - a.atts.zip(e.atts).map { case (a, e) => Rql2AttrType(a.idn, recurse(a.tipe, e.tipe)) }, + SnapiRecordType( + a.atts.zip(e.atts).map { case (a, e) => SnapiAttrType(a.idn, recurse(a.tipe, e.tipe)) }, e.props ) // Iterable Type - case (a: Rql2IterableType, e: Rql2IterableType) if a.props.subsetOf(e.props) => - Rql2IterableType(recurse(a.innerType, e.innerType), e.props) + case (a: SnapiIterableType, e: SnapiIterableType) if a.props.subsetOf(e.props) => + SnapiIterableType(recurse(a.innerType, e.innerType), e.props) // List Type - case (a: Rql2ListType, e: Rql2ListType) if a.props.subsetOf(e.props) => - Rql2ListType(recurse(a.innerType, e.innerType), e.props) + case (a: SnapiListType, e: SnapiListType) if a.props.subsetOf(e.props) => + SnapiListType(recurse(a.innerType, e.innerType), e.props) // FunType // We're strict with FunType. Function type arguments are handled with a relaxed semantic when they are arguments // of package extensions (accepting nullables/tryables, even for their parameter types). The case here is to process // function type arguments of user-defined functions. case (a: FunType, e: FunType) if a.ms == e.ms && a.os == e.os => FunType(e.ms, e.os, recurse(a.r, e.r), e.props) // Or Type - case (Rql2OrType(as, _), Rql2OrType(es, _)) => + case (SnapiOrType(as, _), SnapiOrType(es, _)) => if (as.forall(a => es.exists(e => getCompatibleType(a, e).isDefined))) actual else throw new MergeTypeException - case (a: Rql2UndefinedType, e) if !hasTypeConstraint(e) && a.props.subsetOf(getProps(e)) => + case (a: SnapiUndefinedType, e) if !hasTypeConstraint(e) && a.props.subsetOf(getProps(e)) => // Hit here e // ExpType @@ -415,10 +416,10 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { // // Type Constraints // - case (a: Rql2TypeWithProperties, IsTryable()) => addProp(a, Rql2IsTryableTypeProperty()) - case (a: Rql2TypeWithProperties, IsNullable()) => addProp(a, Rql2IsNullableTypeProperty()) - case (a: Rql2TypeWithProperties, HasTypeProperties(props)) if a.props.subsetOf(props) => addProps(actual, props) - case (a: Rql2TypeWithProperties, DoesNotHaveTypeProperties(props)) if props.intersect(a.props).isEmpty => actual + case (a: SnapiTypeWithProperties, IsTryable()) => addProp(a, SnapiIsTryableTypeProperty()) + case (a: SnapiTypeWithProperties, IsNullable()) => addProp(a, SnapiIsNullableTypeProperty()) + case (a: SnapiTypeWithProperties, HasTypeProperties(props)) if a.props.subsetOf(props) => addProps(actual, props) + case (a: SnapiTypeWithProperties, DoesNotHaveTypeProperties(props)) if props.intersect(a.props).isEmpty => actual case (_, OneOfType(expectedTypes)) => // assert(expectedTypes.forall(t => !isTypeConstraint(t)), s"Type constraint found in OneOfType: $expectedTypes") // We need to merge it (using getCompatibleType) with the actual type to get the target type. @@ -428,11 +429,12 @@ class TypesMerger extends Rql2TypeUtils with StrictLogging { expectedTypes.flatMap(t => getCompatibleType(actual, t)).headOption.getOrElse(throw new MergeTypeException) case (_, MergeableType(t)) => mergeType(actual, t).getOrElse(throw new MergeTypeException) // Type Constraints are different because they never "merge". They just return the actual type unchanged. - case (Rql2RecordType(as, _), ExpectedRecordType(idns)) if idns.subsetOf(as.map(_.idn).toSet) => actual - case (r: Rql2RecordType, e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => actual + case (SnapiRecordType(as, _), ExpectedRecordType(idns)) if idns.subsetOf(as.map(_.idn).toSet) => actual + case (r: SnapiRecordType, e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => actual // Projection on lists or collections: collection.name same as Collection.Transform(collection, x -> x.name) - case (Rql2IterableType(r: Rql2RecordType, _), e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => actual - case (Rql2ListType(r: Rql2RecordType, _), e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => actual + case (SnapiIterableType(r: SnapiRecordType, _), e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => + actual + case (SnapiListType(r: SnapiRecordType, _), e: ExpectedProjType) if r.atts.exists(att => att.idn == e.i) => actual case (_, _: AnythingType) => actual // // Base Types @@ -456,7 +458,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: extends CommonSemanticAnalyzer(tree) with ExpectedTypes with StagedCompiler - with Rql2TypeUtils { + with SnapiTypeUtils { // This function checks if the semantic analysis is being run with the staged compiler // We need it to prevent infinite recursion in the getValue function @@ -467,8 +469,8 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: ) && programContext.programEnvironment.options("staged-compiler") == "true") || // Comes from truffle language (programContext.programEnvironment.options.contains( - "rql.staged-compiler" - ) && programContext.programEnvironment.options("rql.staged-compiler") == "true") + "snapi.staged-compiler" + ) && programContext.programEnvironment.options("snapi.staged-compiler") == "true") } /////////////////////////////////////////////////////////////////////////// @@ -477,7 +479,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: override protected def errorDef: SourceNode ==> Seq[CompilerMessage] = { // Errors - val rql2Errors: PartialFunction[SourceNode, Seq[CompilerMessage]] = { + val snapiErrors: PartialFunction[SourceNode, Seq[CompilerMessage]] = { case i: IdnUse if entity(i) == UnknownEntity() => i match { // Try to see if this UnknownEntity is the user attempting to reference a package name but making a typo. @@ -528,12 +530,12 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: case f: FunApp if funAppHasError(f).isDefined => funAppHasError(f).get case p @ Proj(e, idn) if idnIsAmbiguous(idn, e) => Seq(RepeatedFieldNames(p, idn)) } - rql2Errors.orElse(super.errorDef) + snapiErrors.orElse(super.errorDef) } // we check for errors in errorDef, if there are no errors, we are interested in nonErrors(hints, warnings, infos) override protected def nonErrorDef: SourceNode ==> Seq[CompilerMessage] = { - val rql2NonErrors: PartialFunction[SourceNode, Seq[CompilerMessage]] = { + val snapiNonErrors: PartialFunction[SourceNode, Seq[CompilerMessage]] = { case e @ FunApp(Proj(exp, "Secret"), parameters) if tipe(exp) == PackageType("Environment") && !isStagedCompiler => tipe(exp) match { @@ -546,21 +548,22 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: v match { // If getValue returns an error which means the staged compiler failed to execute "Environment.Secret()" code // We return a warning that the secret is missing. - case Right(Rql2TryValue(Left(error))) => Seq(MissingSecretWarning(e)) + case Right(SnapiTryValue(Left(error))) => Seq(MissingSecretWarning(e)) // In case of Right(TryValue(Right())) that in "Environment.Secret()" is a free variable, we don't report that as a warning case _ => Seq.empty } case _ => Seq.empty } } - rql2NonErrors.orElse(super.nonErrorDef) + snapiNonErrors.orElse(super.nonErrorDef) } private def idnIsAmbiguous(idn: String, e: Exp): Boolean = { actualType(e) match { - case Rql2RecordType(atts, _) => atts.collect { case att if att.idn == idn => att }.length > 1 - case Rql2IterableType(Rql2RecordType(atts, _), _) => atts.collect { case att if att.idn == idn => att }.length > 1 - case Rql2ListType(Rql2RecordType(atts, _), _) => atts.collect { case att if att.idn == idn => att }.length > 1 + case SnapiRecordType(atts, _) => atts.collect { case att if att.idn == idn => att }.length > 1 + case SnapiIterableType(SnapiRecordType(atts, _), _) => + atts.collect { case att if att.idn == idn => att }.length > 1 + case SnapiListType(SnapiRecordType(atts, _), _) => atts.collect { case att if att.idn == idn => att }.length > 1 case _ => false } } @@ -582,7 +585,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: private def repeatedOptionalArgument(fa: Exp, as: Vector[FunAppArg]): Boolean = { actualType(fa) match { case _: FunType => - // For calling RQL2 functions, we check if arguments are unique. + // For calling Snapi functions, we check if arguments are unique. val idns = as.collect { case FunAppArg(_, Some(idn)) => idn } idns.toSet.size != idns.length case PackageEntryType(pkgName, entName) => @@ -698,7 +701,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: case tree.parent(f: LetFun) => new LetFunEntity(f) case tree.parent(f: LetFunRec) => new LetFunRecEntity(f) case tree.parent(f: FunParam) => new FunParamEntity(f) - case tree.parent(d: Rql2Method) => new MethodEntity(d) + case tree.parent(d: SnapiMethod) => new MethodEntity(d) case _ => super.defentity(i) } @@ -794,7 +797,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: override protected def actualTypeDef(n: Exp): Type = { val t = n match { - case e: Rql2Exp => actualTypeRql2Exp(e) + case e: SnapiExp => actualTypeSnapiExp(e) case _ => super.actualTypeDef(n) } // Resolve the type (remove type alias) @@ -820,23 +823,23 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: } } - private def actualTypeRql2Exp(n: Rql2Exp): Type = n match { + private def actualTypeSnapiExp(n: SnapiExp): Type = n match { case c: Const => c match { - case _: NullConst => Rql2UndefinedType(Set(Rql2IsNullableTypeProperty())) + case _: NullConst => SnapiUndefinedType(Set(SnapiIsNullableTypeProperty())) case nc: NumberConst => nc match { - case _: ByteConst => Rql2ByteType() - case _: ShortConst => Rql2ShortType() - case _: IntConst => Rql2IntType() - case _: LongConst => Rql2LongType() - case _: FloatConst => Rql2FloatType() - case _: DoubleConst => Rql2DoubleType() - case _: DecimalConst => Rql2DecimalType() + case _: ByteConst => SnapiByteType() + case _: ShortConst => SnapiShortType() + case _: IntConst => SnapiIntType() + case _: LongConst => SnapiLongType() + case _: FloatConst => SnapiFloatType() + case _: DoubleConst => SnapiDoubleType() + case _: DecimalConst => SnapiDecimalType() } - case _: StringConst => Rql2StringType() - case _: TripleQuotedStringConst => Rql2StringType() - case _: BoolConst => Rql2BoolType() - case _: BinaryConst => Rql2BinaryType() - case _: LocationConst => Rql2LocationType() + case _: StringConst => SnapiStringType() + case _: TripleQuotedStringConst => SnapiStringType() + case _: BoolConst => SnapiBoolType() + case _: BinaryConst => SnapiBinaryType() + case _: LocationConst => SnapiLocationType() } case l: Let => actualType(l.e) case TypeExp(t) => ExpType(t) @@ -845,15 +848,15 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: case None => ErrorType() } case UnaryExp(op, e) => op match { - case _: Not => Rql2BoolType(getProps(actualType(e))) + case _: Not => SnapiBoolType(getProps(actualType(e))) case _: Neg => actualType(e) } case BinaryExp(op, e1, e2) => op match { - case _: ComparableOp => Rql2BoolType(getProps(actualType(e1)) ++ getProps(actualType(e2))) + case _: ComparableOp => SnapiBoolType(getProps(actualType(e1)) ++ getProps(actualType(e2))) case _: BooleanOp => - Rql2BoolType(Set(Rql2IsNullableTypeProperty()) ++ getProps(actualType(e1)) ++ getProps(actualType(e2))) + SnapiBoolType(Set(SnapiIsNullableTypeProperty()) ++ getProps(actualType(e1)) ++ getProps(actualType(e2))) case _: Div => mergeType(actualType(e1), actualType(e2)) match { - case Some(t) => addProp(t, Rql2IsTryableTypeProperty()) // Div can fail on divide by zero. + case Some(t) => addProp(t, SnapiIsTryableTypeProperty()) // Div can fail on divide by zero. case None => ErrorType() } case _ => mergeType(actualType(e1), actualType(e2)) match { @@ -886,7 +889,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: case Some(p) if p.existsEntry(i) => PackageEntryType(name, i) case _ => ErrorType() } - case Rql2RecordType(atts, props) => + case SnapiRecordType(atts, props) => // Only type if record has the field. atts .collectFirst { @@ -895,22 +898,22 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: addProps(att.tipe, props) } .getOrElse(ErrorType()) - case Rql2ListType(Rql2RecordType(atts, recordProps), listProps) => + case SnapiListType(SnapiRecordType(atts, recordProps), listProps) => // Only type if record has the field. atts .collectFirst { case att if att.idn == i => // Include the type properties of the as well. - Rql2ListType(addProps(att.tipe, recordProps), listProps) + SnapiListType(addProps(att.tipe, recordProps), listProps) } .getOrElse(ErrorType()) - case Rql2IterableType(Rql2RecordType(atts, recordProps), listProps) => + case SnapiIterableType(SnapiRecordType(atts, recordProps), listProps) => // Only type if record has the field. atts .collectFirst { case att if att.idn == i => // Include the type properties of the as well. - Rql2IterableType(addProps(att.tipe, recordProps), listProps) + SnapiIterableType(addProps(att.tipe, recordProps), listProps) } .getOrElse(ErrorType()) case _ => ErrorType() @@ -930,7 +933,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: val prevMandatoryArgs = mutable.ArrayBuffer[Arg]() val prevOptionalArgs = mutable.ArrayBuffer[(String, Arg)]() val prevVarArgs = mutable.ArrayBuffer[Arg]() - val outProps = mutable.Set.empty[Rql2TypeProperty] + val outProps = mutable.Set.empty[SnapiTypeProperty] // This list includes mandatory and var args. val argsList = args.collect { case arg if arg.idn.isEmpty => arg }.to[mutable.ArrayBuffer] @@ -1512,7 +1515,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: Right(r) } - final private def getValue(report: CompatibilityReport, e: Exp): Either[ErrorCompilerMessage, Rql2Value] = { + final private def getValue(report: CompatibilityReport, e: Exp): Either[ErrorCompilerMessage, SnapiValue] = { // Recurse over all entities in the order of its dependencies. // Populate an ordered list of declarations as a side-effect. val lets: mutable.ArrayBuffer[LetDecl] = mutable.ArrayBuffer.empty[LetDecl] @@ -1590,16 +1593,16 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: return Left(ex.err) } - // Create an RQL2 program with the expressions and declarations it depends on. + // Create an Snapi program with the expressions and declarations it depends on. // Wrap it into a Type.Cast so that we ensure implicit casts are already. // This allows us to pattern match at L0 more easily, since all types are implicitly casted: // for instance if the is a StringType (i.e. StringConst) but expected type as LocationType, the implicit cast phase - // of Rql2, indirectly applied by calling Type.Cast, makes sure the cast is applied and hence we get back a + // of Snapi, indirectly applied by calling Type.Cast, makes sure the cast is applied and hence we get back a // LocationType (i.e. LocationDescription). val expected = addProps(report.t, report.extraProps) val program = { - if (lets.isEmpty) Rql2Program(Vector.empty, Some(TypePackageBuilder.Cast(expected, e))) - else Rql2Program(Vector.empty, Some(TypePackageBuilder.Cast(expected, Let(lets.to, e)))) + if (lets.isEmpty) SnapiProgram(Vector.empty, Some(TypePackageBuilder.Cast(expected, e))) + else SnapiProgram(Vector.empty, Some(TypePackageBuilder.Cast(expected, Let(lets.to, e)))) } programContext.getOrAddStagedCompilation( @@ -1620,19 +1623,19 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: case StagedCompilerSuccess(v) => var stagedCompilerResult = v // Remove extraProps - if (report.extraProps.contains(Rql2IsTryableTypeProperty())) { - val tryValue = stagedCompilerResult.asInstanceOf[Rql2TryValue].v + if (report.extraProps.contains(SnapiIsTryableTypeProperty())) { + val tryValue = stagedCompilerResult.asInstanceOf[SnapiTryValue].v if (tryValue.isLeft) { return Left(FailedToEvaluate(e, tryValue.left.toOption)) } - stagedCompilerResult = stagedCompilerResult.asInstanceOf[Rql2TryValue].v.right.get + stagedCompilerResult = stagedCompilerResult.asInstanceOf[SnapiTryValue].v.right.get } - if (report.extraProps.contains(Rql2IsNullableTypeProperty())) { - val optionValue = stagedCompilerResult.asInstanceOf[Rql2OptionValue].v + if (report.extraProps.contains(SnapiIsNullableTypeProperty())) { + val optionValue = stagedCompilerResult.asInstanceOf[SnapiOptionValue].v if (optionValue.isEmpty) { return Left(FailedToEvaluate(e, Some("unexpected null value found"))) } - stagedCompilerResult = stagedCompilerResult.asInstanceOf[Rql2OptionValue].v.get + stagedCompilerResult = stagedCompilerResult.asInstanceOf[SnapiOptionValue].v.get } Right(stagedCompilerResult) case StagedCompilerValidationFailure(errs) => @@ -1718,8 +1721,8 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: } case Some(ErrorType()) => Right(ErrorType()) // Propagating errors silently case Some(t) => - val paramTypes = fp.ps.map(x => x.t.getOrElse(Rql2UndefinedType())) - val outType = fp.r.getOrElse(Rql2UndefinedType()) + val paramTypes = fp.ps.map(x => x.t.getOrElse(SnapiUndefinedType())) + val outType = fp.r.getOrElse(SnapiUndefinedType()) Left( Seq( UnexpectedType(f, FunType(paramTypes, Vector.empty, outType, Set.empty), t), @@ -1775,33 +1778,34 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: final override protected def expectedTypeDef(n: Exp): ExpectedType = { n match { - case tree.parent.pair(e: Exp, parent: Rql2Node) => expectedTypeRql2(e, parent) + case tree.parent.pair(e: Exp, parent: SnapiNode) => expectedTypeSnapi(e, parent) case _ => super.expectedTypeDef(n) } } - private val rql2byte = Rql2ByteType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2short = Rql2ShortType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2int = Rql2IntType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2long = Rql2LongType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2float = Rql2FloatType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2double = Rql2DoubleType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2decimal = Rql2DecimalType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2bool = Rql2BoolType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2numerics = OneOfType(rql2byte, rql2short, rql2int, rql2long, rql2float, rql2double, rql2decimal) - private val rql2string = Rql2StringType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2time = Rql2TimeType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2interval = Rql2IntervalType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2date = Rql2DateType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2timestamp = Rql2TimestampType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) - private val rql2numbersAndString = OneOfType(rql2numerics.tipes :+ rql2string) - private val rql2temporals = OneOfType(rql2time, rql2interval, rql2date, rql2timestamp) - private val rql2numericsTemporalsString = OneOfType(rql2numerics.tipes ++ rql2temporals.tipes :+ rql2string) - private val rql2numericsTemporalsStringsBools = - OneOfType(rql2numerics.tipes ++ rql2temporals.tipes ++ Vector(rql2bool, rql2string)) - - private def expectedTypeRql2(e: Exp, parent: Rql2Node): ExpectedType = (parent: @unchecked) match { - case Rql2Program(_, Some(e1)) => + private val snapibyte = SnapiByteType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapishort = SnapiShortType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapiint = SnapiIntType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapilong = SnapiLongType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapifloat = SnapiFloatType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapidouble = SnapiDoubleType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapidecimal = SnapiDecimalType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapibool = SnapiBoolType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapinumerics = + OneOfType(snapibyte, snapishort, snapiint, snapilong, snapifloat, snapidouble, snapidecimal) + private val snapistring = SnapiStringType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapitime = SnapiTimeType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapiinterval = SnapiIntervalType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapidate = SnapiDateType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapitimestamp = SnapiTimestampType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) + private val snapinumbersAndString = OneOfType(snapinumerics.tipes :+ snapistring) + private val snapitemporals = OneOfType(snapitime, snapiinterval, snapidate, snapitimestamp) + private val snapinumericsTemporalsString = OneOfType(snapinumerics.tipes ++ snapitemporals.tipes :+ snapistring) + private val snapinumericsTemporalsStringsBools = + OneOfType(snapinumerics.tipes ++ snapitemporals.tipes ++ Vector(snapibool, snapistring)) + + private def expectedTypeSnapi(e: Exp, parent: SnapiNode): ExpectedType = (parent: @unchecked) match { + case SnapiProgram(_, Some(e1)) => assert(e eq e1) anything case b: LetBind => @@ -1813,7 +1817,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: // The 'in' part of Let can be anything. anything case IfThenElse(e1, e2, e3) => - if (e eq e1) rql2bool + if (e eq e1) snapibool else if (e eq e2) anything else { assert(e eq e3) @@ -1822,8 +1826,8 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: case UnaryExp(op, e1) => assert(e eq e1) op match { - case _: Not => rql2bool - case _: Neg => rql2numerics + case _: Not => snapibool + case _: Neg => snapinumerics } case BinaryExp(op, e1, e2) => def expected(expectedE1: Type, expectedE2: Option[Type]): Type = { @@ -1833,18 +1837,18 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: assert(e eq e2) expectedE2.getOrElse { val t1 = actualType(e1) - if (t1.isInstanceOf[Rql2UndefinedType]) expectedE1 + if (t1.isInstanceOf[SnapiUndefinedType]) expectedE1 else expectedE2.getOrElse(MergeableType(t1)) } } } op match { - case _: Eq | _: Neq => expected(rql2numericsTemporalsStringsBools, None) - case _: ComparableOp => expected(rql2numericsTemporalsString, None) - case _: BooleanOp => expected(rql2bool, Some(rql2bool)) - case _: Plus => expected(rql2numbersAndString, None) - case _ => expected(rql2numerics, Some(rql2numerics)) + case _: Eq | _: Neq => expected(snapinumericsTemporalsStringsBools, None) + case _: ComparableOp => expected(snapinumericsTemporalsString, None) + case _: BooleanOp => expected(snapibool, Some(snapibool)) + case _: Plus => expected(snapinumbersAndString, None) + case _ => expected(snapinumerics, Some(snapinumerics)) } case FunParam(_, mt, Some(e1)) => assert(e eq e1) @@ -1899,7 +1903,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: ExpectedType(ExpectedProjType(i), hint = Some(s"did you mean ${packagesWithEntry.head}.$i?")) else ExpectedType(ExpectedProjType(i)) } else ExpectedType(ExpectedProjType(i), hint = Some(s"did you mean ${names.mkString(" or ")}?")) - case Rql2RecordType(atts, _) => + case SnapiRecordType(atts, _) => if (atts.exists(_.idn == i)) { ExpectedProjType(i) } else { @@ -1909,7 +1913,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: if (names.isEmpty) ExpectedProjType(i) else ExpectedType(ExpectedProjType(i), hint = Some(s"did you mean ${names.mkString(" or ")}?")) } - case Rql2ListType(Rql2RecordType(atts, _), _) => + case SnapiListType(SnapiRecordType(atts, _), _) => if (atts.exists(_.idn == i)) { ExpectedProjType(i) } else { @@ -1919,7 +1923,7 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: if (names.isEmpty) ExpectedProjType(i) else ExpectedType(ExpectedProjType(i), hint = Some(s"did you mean ${names.mkString(" or ")}?")) } - case Rql2IterableType(Rql2RecordType(atts, _), _) => + case SnapiIterableType(SnapiRecordType(atts, _), _) => if (atts.exists(_.idn == i)) { ExpectedProjType(i) } else { @@ -1947,14 +1951,14 @@ class SemanticAnalyzer(val tree: SourceTree.SourceTree)(implicit programContext: /////////////////////////////////////////////////////////////////////////// override lazy val rootType: Option[Type] = { - val Rql2Program(_, me) = tree.root + val SnapiProgram(_, me) = tree.root me.map(tipe) } override protected def descriptionDef: TreeDescription = { - val Rql2Program(methods, me) = tree.root + val SnapiProgram(methods, me) = tree.root val decls = methods.map { - case Rql2Method(FunProto(ps, r, FunBody(e)), idn) => + case SnapiMethod(FunProto(ps, r, FunBody(e)), idn) => val params = ps.map { p => val t = resolveParamType(p) match { case Right(t) => t diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SnapiTypeUtils.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SnapiTypeUtils.scala new file mode 100644 index 000000000..b05295d15 --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SnapiTypeUtils.scala @@ -0,0 +1,238 @@ +/* + * Copyright 2023 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.snapi + +import com.rawlabs.compiler.{ + RawAttrType, + RawBinaryType, + RawBoolType, + RawByteType, + RawDateType, + RawDecimalType, + RawDoubleType, + RawFloatType, + RawIntType, + RawIntervalType, + RawIterableType, + RawListType, + RawLongType, + RawOrType, + RawRecordType, + RawShortType, + RawStringType, + RawTimeType, + RawTimestampType, + RawType, + RawUndefinedType +} +import org.bitbucket.inkytonik.kiama.rewriting.Rewriter.{everywhere, query} +import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalPackageBuilder +import com.rawlabs.snapi.frontend.inferrer.api._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ + DatePackageBuilder, + ListPackageBuilder, + NullablePackageBuilder, + RecordPackageBuilder, + TimePackageBuilder, + TimestampPackageBuilder +} + +trait SnapiTypeUtils { + + final def hasTypeConstraint(t: Type): Boolean = { + everywhere(query[Any] { case _: CommonTypeConstraint | _: SnapiTypeConstraint | _: AnythingType => return true })(t) + false + } + + final def isTypeConstraint(t: Type): Boolean = { + t match { + case _: CommonTypeConstraint | _: SnapiTypeConstraint | _: AnythingType => true + case _ => false + } + } + + final def getProps(t: Type): Set[SnapiTypeProperty] = t match { + case t: SnapiTypeWithProperties => t.props + case _ => Set.empty + } + + final def addProp(t: Type, p: SnapiTypeProperty): Type = t match { + case t: SnapiTypeWithProperties => t.cloneAndAddProp(p) + case _ => t + } + + final def addProps(t: Type, props: Set[SnapiTypeProperty]): Type = { + props.foldLeft(t) { case (t, p) => addProp(t, p) } + } + + final def removeProp(t: Type, p: SnapiTypeProperty): Type = t match { + case t: SnapiTypeWithProperties => t.cloneAndRemoveProp(p) + case _ => t + } + + final def removeProps(t: Type, props: Set[SnapiTypeProperty]): Type = { + props.foldLeft(t) { case (t, p) => removeProp(t, p) } + } + + final def resetProps(t: Type, props: Set[SnapiTypeProperty]): Type = { + val clean = removeProps(t, getProps(t)) + addProps(clean, props) + } + + final def inferTypeToSnapiType(t: SourceType, makeNullable: Boolean, makeTryable: Boolean): Type = { + def wrapProps(t: Type, nullable: Boolean, tryable: Boolean): Type = { + val nullType = if (nullable) addProp(t, SnapiIsNullableTypeProperty()) else t + if (tryable) addProp(nullType, SnapiIsTryableTypeProperty()) else nullType + } + + t match { + case SourceByteType(n) => wrapProps(SnapiByteType(), n || makeNullable, makeTryable) + case SourceShortType(n) => wrapProps(SnapiShortType(), n || makeNullable, makeTryable) + case SourceIntType(n) => wrapProps(SnapiIntType(), n || makeNullable, makeTryable) + case SourceLongType(n) => wrapProps(SnapiLongType(), n || makeNullable, makeTryable) + case SourceFloatType(n) => wrapProps(SnapiFloatType(), n || makeNullable, makeTryable) + case SourceDoubleType(n) => wrapProps(SnapiDoubleType(), n || makeNullable, makeTryable) + case SourceDecimalType(n) => wrapProps(SnapiDecimalType(), n || makeNullable, makeTryable) + case SourceBoolType(n) => wrapProps(SnapiBoolType(), n || makeNullable, makeTryable) + case SourceStringType(n) => wrapProps(SnapiStringType(), n || makeNullable, makeTryable) + case SourceDateType(_, n) => wrapProps(SnapiDateType(), n || makeNullable, makeTryable) + case SourceTimeType(_, n) => wrapProps(SnapiTimeType(), n || makeNullable, makeTryable) + case SourceTimestampType(_, n) => wrapProps(SnapiTimestampType(), n || makeNullable, makeTryable) + case SourceIntervalType(n) => wrapProps(SnapiIntervalType(), n || makeNullable, makeTryable) + case SourceRecordType(atts, n) => wrapProps( + SnapiRecordType( + atts.map(att => SnapiAttrType(att.idn, inferTypeToSnapiType(att.tipe, makeNullable, makeTryable))) + ), + n || makeNullable, + makeTryable + ) + case SourceCollectionType(inner, n) => wrapProps( + SnapiIterableType(inferTypeToSnapiType(inner, makeNullable, makeTryable)), + n || makeNullable, + makeTryable + ) + case SourceBinaryType(n) => wrapProps(SnapiBinaryType(), n || makeNullable, makeTryable) + case _: SourceNothingType => wrapProps(SnapiUndefinedType(), makeNullable, makeTryable) + case _: SourceNullType => wrapProps(SnapiUndefinedType(), true, makeTryable) + case _: SourceAnyType => AnyType() + case SourceOrType(ors) => + val options = ors + .map(x => inferTypeToSnapiType(x, makeNullable, makeTryable)) // recurse with the flags + .map(t => resetProps(t, Set.empty)) // but clear 'tryable' from or type options + nullable + val nullable = ors.exists(_.nullable) + if (nullable) SnapiOrType(options.toVector, Set(SnapiIsNullableTypeProperty())) + else SnapiOrType(options.toVector) + } + + } + + def isComparable(t: Type): Boolean = { + everywhere(query[Type] { case _: FunType => return false })(t) + true + } + + // Returns Option[RawType] as not all Snapi types are representable as Raw types. + def snapiTypeToRawType(t: Type): Option[RawType] = { + def convert(t: Type): RawType = { + // Read nullable and triable properties. + var nullable = false + var triable = false + t match { + case tp: SnapiTypeWithProperties => + if (tp.props.contains(SnapiIsNullableTypeProperty())) { + nullable = true + } + if (tp.props.contains(SnapiIsTryableTypeProperty())) { + triable = true + } + case _ => + } + // Convert type. + t match { + case _: SnapiUndefinedType => RawUndefinedType(nullable, triable) + case _: SnapiByteType => RawByteType(nullable, triable) + case _: SnapiShortType => RawShortType(nullable, triable) + case _: SnapiIntType => RawIntType(nullable, triable) + case _: SnapiLongType => RawLongType(nullable, triable) + case _: SnapiFloatType => RawFloatType(nullable, triable) + case _: SnapiDoubleType => RawDoubleType(nullable, triable) + case _: SnapiDecimalType => RawDecimalType(nullable, triable) + case _: SnapiBoolType => RawBoolType(nullable, triable) + case _: SnapiStringType => RawStringType(nullable, triable) + case _: SnapiBinaryType => RawBinaryType(nullable, triable) + case _: SnapiDateType => RawDateType(nullable, triable) + case _: SnapiTimeType => RawTimeType(nullable, triable) + case _: SnapiTimestampType => RawTimestampType(nullable, triable) + case _: SnapiIntervalType => RawIntervalType(nullable, triable) + case SnapiRecordType(atts, _) => RawRecordType( + atts.map { case SnapiAttrType(idn, t1) => RawAttrType(idn, convert(t1)) }, + nullable, + triable + ) + case SnapiListType(inner, _) => RawListType(convert(inner), nullable, triable) + case SnapiIterableType(inner, _) => RawIterableType(convert(inner), nullable, triable) + case SnapiOrType(ors, _) => RawOrType(ors.map(convert), nullable, triable) + case _ => throw new IllegalArgumentException() + } + } + + try { + Some(convert(t)) + } catch { + case _: IllegalArgumentException => None + } + } + + final def valueToExp(value: SnapiValue, t: Type): Exp = value match { + case SnapiByteValue(v) => ByteConst(v.toString) + case SnapiShortValue(v) => ShortConst(v.toString) + case SnapiIntValue(v) => IntConst(v.toString) + case SnapiLongValue(v) => LongConst(v.toString) + case SnapiFloatValue(v) => FloatConst(v.toString) + case SnapiDoubleValue(v) => DoubleConst(v.toString) + case SnapiStringValue(v) => StringConst(v) + case SnapiBoolValue(v) => BoolConst(v) + case SnapiOptionValue(option) => + val innerType = resetProps(t, Set.empty) + option + .map(v => valueToExp(v, innerType)) + .map(NullablePackageBuilder.Build(_)) + .getOrElse(NullablePackageBuilder.Empty(innerType)) + case SnapiRecordValue(vs) => + val SnapiRecordType(atts, _) = t + RecordPackageBuilder.Build( + vs.zip(atts).map { case (SnapiRecordAttr(idn, v1), att) => idn -> valueToExp(v1, att.tipe) }.toVector + ) + case SnapiListValue(v) => + val SnapiListType(innerType, _) = t + ListPackageBuilder.Build(v.map(x => valueToExp(x, innerType)): _*) + case SnapiDateValue(v) => DatePackageBuilder.FromLocalDate(v) + case SnapiTimeValue(v) => TimePackageBuilder.FromLocalTime(v) + case SnapiTimestampValue(v) => TimestampPackageBuilder.FromLocalDateTime(v) + case SnapiIntervalValue( + years, + month, + weeks, + days, + hours, + minutes, + seconds, + millis + ) => IntervalPackageBuilder.FromRawInterval(years, month, weeks, days, hours, minutes, seconds, millis) + } + +} + +object SnapiTypeUtils extends SnapiTypeUtils diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/StagedCompiler.scala similarity index 65% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/StagedCompiler.scala index ea4565ddc..9d8cb3f18 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/StagedCompiler.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/StagedCompiler.scala @@ -10,33 +10,33 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.rawlabs.compiler.{CompilerService, ErrorMessage, ErrorPosition, ErrorRange, ProgramEnvironment} import com.rawlabs.utils.core.RawSettings import org.graalvm.polyglot.{Context, PolyglotAccess, PolyglotException, Source, Value} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.antlr4.ParserErrors -import com.rawlabs.snapi.frontend.rql2.extensions._ -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.antlr4.ParserErrors +import com.rawlabs.snapi.frontend.snapi.extensions._ +import com.rawlabs.snapi.frontend.snapi.source._ import scala.collection.mutable import scala.util.control.NonFatal sealed trait StagedCompilerResponse -final case class StagedCompilerSuccess(v: Rql2Value) extends StagedCompilerResponse +final case class StagedCompilerSuccess(v: SnapiValue) extends StagedCompilerResponse final case class StagedCompilerValidationFailure(errors: List[ErrorMessage]) extends StagedCompilerResponse final case class StagedCompilerRuntimeFailure(error: String) extends StagedCompilerResponse /** * Support for stage compilation. - * This allows an RQL2/Snapi source to be evaluated in a new context, with a given environment and RawSettings. + * This allows an Snapi/Snapi source to be evaluated in a new context, with a given environment and RawSettings. */ trait StagedCompiler { /** * Evaluate the given source code in a new context. - * The source code is expected to be a valid RQL2/Snapi program. + * The source code is expected to be a valid Snapi/Snapi program. * The result is a RawValue. * * If the Truffle runtime execution thread is interrupted, an InterruptedException is thrown. @@ -54,27 +54,27 @@ trait StagedCompiler { // Add environment settings as hardcoded environment variables. val ctxBuilder = Context - .newBuilder("rql") + .newBuilder("snapi") .engine(engine) .environment("RAW_PROGRAM_ENVIRONMENT", ProgramEnvironment.serializeToString(environment)) .allowExperimentalOptions(true) .allowPolyglotAccess(PolyglotAccess.ALL) environment.options.get("staged-compiler").foreach { stagedCompiler => - ctxBuilder.option("rql.staged-compiler", stagedCompiler) + ctxBuilder.option("snapi.staged-compiler", stagedCompiler) } - ctxBuilder.option("rql.settings", settings.renderAsString) + ctxBuilder.option("snapi.settings", settings.renderAsString) val ctx = ctxBuilder.build() - ctx.initialize("rql") + ctx.initialize("snapi") ctx.enter() try { val truffleSource = Source - .newBuilder("rql", source, "unnamed") + .newBuilder("snapi", source, "unnamed") .cached(false) // Disable code caching because of the inferrer. .build() val polyglotValue = ctx.eval(truffleSource) - val rql2Value = polyglotValueToRql2Value(polyglotValue, tipe) - StagedCompilerSuccess(rql2Value) + val snapiValue = polyglotValueToSnapiValue(polyglotValue, tipe) + StagedCompilerSuccess(snapiValue) } catch { case ex: PolyglotException => // (msb): The following are various "hacks" to ensure the inner language InterruptException propagates "out". @@ -120,85 +120,85 @@ trait StagedCompiler { } } - private def polyglotValueToRql2Value(v: Value, t: Type)(implicit settings: RawSettings): Rql2Value = { + private def polyglotValueToSnapiValue(v: Value, t: Type)(implicit settings: RawSettings): SnapiValue = { t match { - case t: Rql2TypeWithProperties if t.props.contains(Rql2IsTryableTypeProperty()) => + case t: SnapiTypeWithProperties if t.props.contains(SnapiIsTryableTypeProperty()) => if (v.isException) { try { v.throwException() throw new AssertionError("should not happen") } catch { - case NonFatal(ex) => Rql2TryValue(Left(ex.getMessage)) + case NonFatal(ex) => SnapiTryValue(Left(ex.getMessage)) } } else { - Rql2TryValue(Right(polyglotValueToRql2Value(v, t.cloneAndRemoveProp(Rql2IsTryableTypeProperty())))) + SnapiTryValue(Right(polyglotValueToSnapiValue(v, t.cloneAndRemoveProp(SnapiIsTryableTypeProperty())))) } - case t: Rql2TypeWithProperties if t.props.contains(Rql2IsNullableTypeProperty()) => + case t: SnapiTypeWithProperties if t.props.contains(SnapiIsNullableTypeProperty()) => if (v.isNull) { - Rql2OptionValue(None) + SnapiOptionValue(None) } else { - Rql2OptionValue(Some(polyglotValueToRql2Value(v, t.cloneAndRemoveProp(Rql2IsNullableTypeProperty())))) + SnapiOptionValue(Some(polyglotValueToSnapiValue(v, t.cloneAndRemoveProp(SnapiIsNullableTypeProperty())))) } - case _: Rql2UndefinedType => throw new AssertionError("Rql2Undefined is not triable and is not nullable.") - case _: Rql2BoolType => Rql2BoolValue(v.asBoolean()) - case _: Rql2StringType => Rql2StringValue(v.asString()) - case _: Rql2ByteType => Rql2ByteValue(v.asByte()) - case _: Rql2ShortType => Rql2ShortValue(v.asShort()) - case _: Rql2IntType => Rql2IntValue(v.asInt()) - case _: Rql2LongType => Rql2LongValue(v.asLong()) - case _: Rql2FloatType => Rql2FloatValue(v.asFloat()) - case _: Rql2DoubleType => Rql2DoubleValue(v.asDouble()) - case _: Rql2DecimalType => + case _: SnapiUndefinedType => throw new AssertionError("SnapiUndefined is not triable and is not nullable.") + case _: SnapiBoolType => SnapiBoolValue(v.asBoolean()) + case _: SnapiStringType => SnapiStringValue(v.asString()) + case _: SnapiByteType => SnapiByteValue(v.asByte()) + case _: SnapiShortType => SnapiShortValue(v.asShort()) + case _: SnapiIntType => SnapiIntValue(v.asInt()) + case _: SnapiLongType => SnapiLongValue(v.asLong()) + case _: SnapiFloatType => SnapiFloatValue(v.asFloat()) + case _: SnapiDoubleType => SnapiDoubleValue(v.asDouble()) + case _: SnapiDecimalType => val bg = BigDecimal(v.asString()) - Rql2DecimalValue(bg) - case _: Rql2DateType => + SnapiDecimalValue(bg) + case _: SnapiDateType => val date = v.asDate() - Rql2DateValue(date) - case _: Rql2TimeType => + SnapiDateValue(date) + case _: SnapiTimeType => val time = v.asTime() - Rql2TimeValue(time) - case _: Rql2TimestampType => + SnapiTimeValue(time) + case _: SnapiTimestampType => val localDate = v.asDate() val localTime = v.asTime() - Rql2TimestampValue(localDate.atTime(localTime)) - case _: Rql2IntervalType => + SnapiTimestampValue(localDate.atTime(localTime)) + case _: SnapiIntervalType => val d = v.asDuration() - Rql2IntervalValue(0, 0, 0, d.toDaysPart.toInt, d.toHoursPart, d.toMinutesPart, d.toSecondsPart, d.toMillisPart) - case _: Rql2BinaryType => + SnapiIntervalValue(0, 0, 0, d.toDaysPart.toInt, d.toHoursPart, d.toMinutesPart, d.toSecondsPart, d.toMillisPart) + case _: SnapiBinaryType => val bufferSize = v.getBufferSize.toInt val byteArray = new Array[Byte](bufferSize) for (i <- 0 until bufferSize) { byteArray(i) = v.readBufferByte(i) } - Rql2BinaryValue(byteArray) - case Rql2RecordType(atts, _) => - val vs = atts.map(att => Rql2RecordAttr(att.idn, polyglotValueToRql2Value(v.getMember(att.idn), att.tipe))) - Rql2RecordValue(vs) - case Rql2ListType(innerType, _) => - val seq = mutable.ArrayBuffer[Rql2Value]() + SnapiBinaryValue(byteArray) + case SnapiRecordType(atts, _) => + val vs = atts.map(att => SnapiRecordAttr(att.idn, polyglotValueToSnapiValue(v.getMember(att.idn), att.tipe))) + SnapiRecordValue(vs) + case SnapiListType(innerType, _) => + val seq = mutable.ArrayBuffer[SnapiValue]() for (i <- 0L until v.getArraySize) { val v1 = v.getArrayElement(i) - seq.append(polyglotValueToRql2Value(v1, innerType)) + seq.append(polyglotValueToSnapiValue(v1, innerType)) } - Rql2ListValue(seq) - case Rql2IterableType(innerType, _) => - val seq = mutable.ArrayBuffer[Rql2Value]() + SnapiListValue(seq) + case SnapiIterableType(innerType, _) => + val seq = mutable.ArrayBuffer[SnapiValue]() val it = v.getIterator while (it.hasIteratorNextElement) { val v1 = it.getIteratorNextElement - seq.append(polyglotValueToRql2Value(v1, innerType)) + seq.append(polyglotValueToSnapiValue(v1, innerType)) } if (it.canInvokeMember("close")) { val callable = it.getMember("close") callable.execute() } - Rql2IterableValue(seq) - case Rql2OrType(tipes, _) => + SnapiIterableValue(seq) + case SnapiOrType(tipes, _) => val idx = v.invokeMember("getIndex").asInt() val v1 = v.invokeMember("getValue") val tipe = tipes(idx) - polyglotValueToRql2Value(v1, tipe) - case _: Rql2LocationType => + polyglotValueToSnapiValue(v1, tipe) + case _: SnapiLocationType => val bufferSize = v.getBufferSize.toInt val byteArray = new Array[Byte](bufferSize) for (i <- 0 until bufferSize) { @@ -206,7 +206,7 @@ trait StagedCompiler { } val location = LocationDescription.toLocation(LocationDescription.deserialize(byteArray)) val publicDescription = v.asString() - Rql2LocationValue(location, publicDescription) + SnapiLocationValue(location, publicDescription) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SymbolTable.scala similarity index 78% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SymbolTable.scala index f00a4a564..1ae0e0cf1 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SymbolTable.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SymbolTable.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import org.bitbucket.inkytonik.kiama.util.Entity import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.PackageExtension -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.PackageExtension +import com.rawlabs.snapi.frontend.snapi.source._ /** Entity for a program parameter. */ final class ProgramParamEntity(val p: SourceProgramParam) extends Entity @@ -35,4 +35,4 @@ final class FunParamEntity(val f: FunParam) extends Entity final class PackageEntity(val p: PackageExtension) extends Entity -final class MethodEntity(val d: Rql2Method) extends Entity +final class MethodEntity(val d: SnapiMethod) extends Entity diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SyntaxAnalyzer.scala similarity index 79% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SyntaxAnalyzer.scala index 87cf968a3..2fc97dd9f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/SyntaxAnalyzer.scala @@ -10,16 +10,16 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import org.bitbucket.inkytonik.kiama.parsing._ import org.bitbucket.inkytonik.kiama.util.Positions import com.rawlabs.snapi.frontend.base.SyntaxAnalyzer.identRegex import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} import com.rawlabs.snapi.frontend.base -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.snapi.source._ import scala.util.matching.Regex @@ -101,9 +101,11 @@ class SyntaxAnalyzer(val positions: Positions) extends Parsers(positions) with b // Program vs Package /////////////////////////////////////////////////////////////////////////// - override lazy val program: Parser[BaseProgram] = rep(rql2Method) ~ opt(exp) ^^ { case ms ~ me => Rql2Program(ms, me) } + override lazy val program: Parser[BaseProgram] = rep(snapiMethod) ~ opt(exp) ^^ { + case ms ~ me => SnapiProgram(ms, me) + } - final protected lazy val rql2Method: Parser[Rql2Method] = idnDef ~ funProto ^^ { case i ~ p => Rql2Method(p, i) } + final protected lazy val snapiMethod: Parser[SnapiMethod] = idnDef ~ funProto ^^ { case i ~ p => SnapiMethod(p, i) } /////////////////////////////////////////////////////////////////////////// // Types @@ -118,8 +120,8 @@ class SyntaxAnalyzer(val positions: Positions) extends Parsers(positions) with b final override protected lazy val tipe: Parser[Type] = (rawType | "(" ~> tipe <~ ")") ~ opt(typeProps) ^^ { case t ~ mProps => mProps match { case Some(props) => t match { - case pType: Rql2TypeWithProperties => - props.foldLeft(pType)((t, p) => t.cloneAndAddProp(p).asInstanceOf[Rql2TypeWithProperties]) + case pType: SnapiTypeWithProperties => + props.foldLeft(pType)((t, p) => t.cloneAndAddProp(p).asInstanceOf[SnapiTypeWithProperties]) case _ => t } case None => t @@ -128,64 +130,64 @@ class SyntaxAnalyzer(val positions: Positions) extends Parsers(positions) with b private lazy val rawType: Parser[Type] = orType private lazy val basicType: Parser[Type] = propFriendlyType | plainType - final private lazy val propFriendlyType: Parser[Rql2TypeWithProperties] = funType | primitiveType | + final private lazy val propFriendlyType: Parser[SnapiTypeWithProperties] = funType | primitiveType | recordType | iterableType | listType | undefinedType | "(" ~> propFriendlyType <~ ")" protected lazy val orType: PackratParser[Type] = { tipe ~ rep1(tokOr ~> tipe) ^^ { - case t1 ~ ts => ts.tail.foldLeft(Rql2OrType(t1, ts.head, Set.empty))((agg, t) => Rql2OrType(agg, t, Set.empty)) + case t1 ~ ts => ts.tail.foldLeft(SnapiOrType(t1, ts.head, Set.empty))((agg, t) => SnapiOrType(agg, t, Set.empty)) } | basicType } - final protected lazy val primitiveType: Parser[Rql2PrimitiveType] = + final protected lazy val primitiveType: Parser[SnapiPrimitiveType] = boolType | stringType | locationType | binaryType | numberType | temporalType - final protected lazy val boolType: Parser[Rql2BoolType] = tokBool ^^^ Rql2BoolType() + final protected lazy val boolType: Parser[SnapiBoolType] = tokBool ^^^ SnapiBoolType() - final protected lazy val stringType: Parser[Rql2StringType] = tokString ^^^ Rql2StringType() + final protected lazy val stringType: Parser[SnapiStringType] = tokString ^^^ SnapiStringType() - final protected lazy val locationType: Parser[Rql2LocationType] = tokLocation ^^^ Rql2LocationType() + final protected lazy val locationType: Parser[SnapiLocationType] = tokLocation ^^^ SnapiLocationType() - final protected lazy val binaryType: Parser[Rql2BinaryType] = tokBinary ^^^ Rql2BinaryType() + final protected lazy val binaryType: Parser[SnapiBinaryType] = tokBinary ^^^ SnapiBinaryType() - final protected lazy val numberType: Parser[Rql2NumberType] = + final protected lazy val numberType: Parser[SnapiNumberType] = byteType | shortType | intType | longType | floatType | doubleType | decimalType - final protected lazy val byteType: Parser[Rql2ByteType] = tokByte ^^^ Rql2ByteType() + final protected lazy val byteType: Parser[SnapiByteType] = tokByte ^^^ SnapiByteType() - final protected lazy val shortType: Parser[Rql2ShortType] = tokShort ^^^ Rql2ShortType() + final protected lazy val shortType: Parser[SnapiShortType] = tokShort ^^^ SnapiShortType() - final protected lazy val intType: Parser[Rql2IntType] = tokInt ^^^ Rql2IntType() + final protected lazy val intType: Parser[SnapiIntType] = tokInt ^^^ SnapiIntType() - final protected lazy val longType: Parser[Rql2LongType] = tokLong ^^^ Rql2LongType() + final protected lazy val longType: Parser[SnapiLongType] = tokLong ^^^ SnapiLongType() - final protected lazy val floatType: Parser[Rql2FloatType] = tokFloat ^^^ Rql2FloatType() + final protected lazy val floatType: Parser[SnapiFloatType] = tokFloat ^^^ SnapiFloatType() - final protected lazy val doubleType: Parser[Rql2DoubleType] = tokDouble ^^^ Rql2DoubleType() + final protected lazy val doubleType: Parser[SnapiDoubleType] = tokDouble ^^^ SnapiDoubleType() - final protected lazy val decimalType: Parser[Rql2DecimalType] = tokDecimal ^^^ Rql2DecimalType() + final protected lazy val decimalType: Parser[SnapiDecimalType] = tokDecimal ^^^ SnapiDecimalType() - final protected lazy val temporalType: Parser[Rql2TemporalType] = dateType | timeType | intervalType | timestampType + final protected lazy val temporalType: Parser[SnapiTemporalType] = dateType | timeType | intervalType | timestampType - final protected lazy val dateType: Parser[Rql2DateType] = tokDate ^^^ Rql2DateType() + final protected lazy val dateType: Parser[SnapiDateType] = tokDate ^^^ SnapiDateType() - final protected lazy val timeType: Parser[Rql2TimeType] = tokTime ^^^ Rql2TimeType() + final protected lazy val timeType: Parser[SnapiTimeType] = tokTime ^^^ SnapiTimeType() - final protected lazy val intervalType: Parser[Rql2IntervalType] = tokInterval ^^^ Rql2IntervalType() + final protected lazy val intervalType: Parser[SnapiIntervalType] = tokInterval ^^^ SnapiIntervalType() - final protected lazy val timestampType: Parser[Rql2TimestampType] = tokTimestamp ^^^ Rql2TimestampType() + final protected lazy val timestampType: Parser[SnapiTimestampType] = tokTimestamp ^^^ SnapiTimestampType() - final protected lazy val recordType: Parser[Rql2RecordType] = - tokRecord ~> ("(" ~> repsep(attrType, ",") <~ opt(",") <~ ")") ^^ (attrs => Rql2RecordType(attrs)) + final protected lazy val recordType: Parser[SnapiRecordType] = + tokRecord ~> ("(" ~> repsep(attrType, ",") <~ opt(",") <~ ")") ^^ (attrs => SnapiRecordType(attrs)) - final protected lazy val attrType: Parser[Rql2AttrType] = (ident <~ ":") ~ tipe ^^ Rql2AttrType + final protected lazy val attrType: Parser[SnapiAttrType] = (ident <~ ":") ~ tipe ^^ SnapiAttrType - final protected lazy val iterableType: Parser[Rql2IterableType] = - tokCollection ~> ("(" ~> tipe <~ ")") ^^ (innerType => Rql2IterableType(innerType)) + final protected lazy val iterableType: Parser[SnapiIterableType] = + tokCollection ~> ("(" ~> tipe <~ ")") ^^ (innerType => SnapiIterableType(innerType)) - final protected lazy val listType: Parser[Rql2ListType] = - tokList ~> ("(" ~> tipe <~ ")") ^^ (innerType => Rql2ListType(innerType)) + final protected lazy val listType: Parser[SnapiListType] = + tokList ~> ("(" ~> tipe <~ ")") ^^ (innerType => SnapiListType(innerType)) final protected lazy val funType: PackratParser[FunType] = { ("(" ~> repsep(funOptTypeParam | tipe, ",") <~ ")") ~ ("->" ~> tipe) ^^ { @@ -204,7 +206,7 @@ class SyntaxAnalyzer(val positions: Positions) extends Parsers(positions) with b final protected lazy val expType: Parser[ExpType] = tokType ~> tipe ^^ ExpType - final protected lazy val undefinedType: Parser[Rql2UndefinedType] = tokUndefined ^^^ Rql2UndefinedType() + final protected lazy val undefinedType: Parser[SnapiUndefinedType] = tokUndefined ^^^ SnapiUndefinedType() final protected lazy val typeAliasType: Parser[TypeAliasType] = typeIdnUse ^^ TypeAliasType @@ -214,12 +216,12 @@ class SyntaxAnalyzer(val positions: Positions) extends Parsers(positions) with b if (isReservedType(idn)) failure("reserved type keyword") else success(idn) } - final private lazy val typeProps: Parser[Set[Rql2TypeProperty]] = { - ("@try" ~ "@null" ^^^ Set[Rql2TypeProperty](Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty())) | - ("@null" ~ "@try" ^^^ Set[Rql2TypeProperty](Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty())) | - ("@try" ^^^ Set[Rql2TypeProperty](Rql2IsTryableTypeProperty())) | - ("@null" ^^^ Set[Rql2TypeProperty](Rql2IsNullableTypeProperty())) | - success(Set.empty[Rql2TypeProperty]) + final private lazy val typeProps: Parser[Set[SnapiTypeProperty]] = { + ("@try" ~ "@null" ^^^ Set[SnapiTypeProperty](SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty())) | + ("@null" ~ "@try" ^^^ Set[SnapiTypeProperty](SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty())) | + ("@try" ^^^ Set[SnapiTypeProperty](SnapiIsTryableTypeProperty())) | + ("@null" ^^^ Set[SnapiTypeProperty](SnapiIsNullableTypeProperty())) | + success(Set.empty[SnapiTypeProperty]) } /////////////////////////////////////////////////////////////////////////// diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Tree.scala similarity index 86% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Tree.scala index 5fe821766..10026f186 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/Tree.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/Tree.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.source.InternalSourcePrettyPrinter +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.source.InternalSourcePrettyPrinter class Tree(originalRoot: SourceProgram, ensureTree: Boolean = true)( implicit programContext: ProgramContext diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/TreeWithPositions.scala similarity index 84% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/TreeWithPositions.scala index 50eb670f8..d7f598532 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/TreeWithPositions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/TreeWithPositions.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.antlr4.{Antlr4SyntaxAnalyzer, ParseProgramResult} class TreeWithPositions(originalSource: String, ensureTree: Boolean = true, frontend: Boolean = false)( implicit programContext: ProgramContext diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/Antlr4SyntaxAnalyzer.scala similarity index 75% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/Antlr4SyntaxAnalyzer.scala index d0a14d7ab..7fe763841 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Antlr4SyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/Antlr4SyntaxAnalyzer.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 import com.rawlabs.compiler.Message import org.antlr.v4.runtime.tree.ParseTree @@ -18,9 +18,9 @@ import org.antlr.v4.runtime.{CharStreams, CommonTokenStream, TokenStream} import org.bitbucket.inkytonik.kiama.parsing.Parsers import org.bitbucket.inkytonik.kiama.util.{Positions, Source, StringSource} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source.SourceProgram +import com.rawlabs.snapi.frontend.snapi.source.SourceProgram import com.rawlabs.snapi.parser.generated.{SnapiLexer, SnapiParser} -import com.rawlabs.snapi.frontend.rql2.source.Rql2Program +import com.rawlabs.snapi.frontend.snapi.source.SnapiProgram abstract class ParseResult(errors: List[Message]) { def hasErrors: Boolean = errors.nonEmpty @@ -33,7 +33,7 @@ final case class ParseTypeResult(errors: List[Message], tipe: Type) extends Pars class Antlr4SyntaxAnalyzer(val positions: Positions, isFrontend: Boolean) extends Parsers(positions) { def parse(s: String): ParseProgramResult[SourceProgram] = { - val rawErrorListener = new Rql2ErrorListener() + val rawErrorListener = new SnapiErrorListener() val stream = getTokenStream(s, rawErrorListener) parse(stream, StringSource(s), rawErrorListener) } @@ -41,22 +41,22 @@ class Antlr4SyntaxAnalyzer(val positions: Positions, isFrontend: Boolean) extend protected def parse( stream: TokenStream, source: Source, - errorListener: Rql2ErrorListener + errorListener: SnapiErrorListener ): ParseProgramResult[SourceProgram] = { val parser = new SnapiParser(stream) parser.removeErrorListeners() parser.addErrorListener(errorListener) val tree: ParseTree = parser.prog - val visitorParseErrors = new Rql2VisitorParseErrors - val visitor = new Rql2SnapiVisitor(positions, source, isFrontend, visitorParseErrors) - val result = visitor.visit(tree).asInstanceOf[Rql2Program] + val visitorParseErrors = new SnapiVisitorParseErrors + val visitor = new SnapiVisitor(positions, source, isFrontend, visitorParseErrors) + val result = visitor.visit(tree).asInstanceOf[SnapiProgram] val totalErrors = errorListener.getErrors ++ visitorParseErrors.getErrors ParseProgramResult(totalErrors, result) } - protected def getTokenStream(s: String, errorListener: Rql2ErrorListener): CommonTokenStream = { + protected def getTokenStream(s: String, errorListener: SnapiErrorListener): CommonTokenStream = { val lexer = new SnapiLexer(CharStreams.fromString(s)) lexer.removeErrorListeners() lexer.addErrorListener(errorListener) @@ -66,15 +66,15 @@ class Antlr4SyntaxAnalyzer(val positions: Positions, isFrontend: Boolean) extend def parseType(s: String): ParseTypeResult = { val source = StringSource(s) - val rawErrorListener = new Rql2ErrorListener() + val rawErrorListener = new SnapiErrorListener() val parser = new SnapiParser(getTokenStream(s, rawErrorListener)) parser.removeErrorListeners() parser.addErrorListener(rawErrorListener) val tree: ParseTree = parser.tipe - val visitorParseErrors = new Rql2VisitorParseErrors - val visitor: Rql2SnapiVisitor = new Rql2SnapiVisitor(positions, source, isFrontend, visitorParseErrors) + val visitorParseErrors = new SnapiVisitorParseErrors + val visitor: SnapiVisitor = new SnapiVisitor(positions, source, isFrontend, visitorParseErrors) val result: Type = visitor.visit(tree).asInstanceOf[Type] val totalErrors = rawErrorListener.getErrors ++ visitorParseErrors.getErrors diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/CommentsAntlrSyntaxAnalyzer.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/CommentsAntlrSyntaxAnalyzer.scala index fd73f1705..bb550ea78 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/CommentsAntlrSyntaxAnalyzer.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/CommentsAntlrSyntaxAnalyzer.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} import com.rawlabs.snapi.frontend.base.source.{BaseNode, BaseProgram} -import com.rawlabs.snapi.frontend.rql2.source.SourceProgram +import com.rawlabs.snapi.frontend.snapi.source.SourceProgram import java.util import scala.collection.JavaConverters._ @@ -28,7 +28,7 @@ class CommentsAntlrSyntaxAnalyzer( ) extends Antlr4SyntaxAnalyzer(positions, isFrontend) { override def parse(s: String): ParseProgramResult[SourceProgram] = { - val rawErrorListener = new Rql2ErrorListener() + val rawErrorListener = new SnapiErrorListener() val source = StringSource(s) val stream = getTokenStream(s, rawErrorListener) val r = parse(stream, source, rawErrorListener) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/ParserErrors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/ParserErrors.scala similarity index 90% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/ParserErrors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/ParserErrors.scala index add4b86c4..3cd17330d 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/ParserErrors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/ParserErrors.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 object ParserErrors { val ParserErrorCode = "parserError" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2ErrorListener.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiErrorListener.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2ErrorListener.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiErrorListener.scala index 04088fbf7..99d896623 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2ErrorListener.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiErrorListener.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange, Message} import org.antlr.v4.runtime.{BaseErrorListener, RecognitionException, Recognizer, Token} import scala.collection.mutable -class Rql2ErrorListener extends BaseErrorListener { +class SnapiErrorListener extends BaseErrorListener { private val errors = new mutable.ListBuffer[Message] diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2Positions.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiPositions.scala similarity index 95% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2Positions.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiPositions.scala index d58dff223..96df71d63 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2Positions.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiPositions.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 import org.antlr.v4.runtime.{ParserRuleContext, Token} import org.bitbucket.inkytonik.kiama.util.{Position, Positions, Source} -class Rql2Positions(positions: Positions, source: Source) { +class SnapiPositions(positions: Positions, source: Source) { /** * Sets the position of the node in the position map based on start and end of a ParserRuleContext object. diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2SnapiVisitor.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiVisitor.scala similarity index 93% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2SnapiVisitor.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiVisitor.scala index de99cf93f..ba0ebec9a 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2SnapiVisitor.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiVisitor.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 import com.rawlabs.compiler.{ErrorMessage, ErrorPosition, ErrorRange} import com.rawlabs.utils.core.RawUtils @@ -18,27 +18,27 @@ import org.antlr.v4.runtime.ParserRuleContext import org.apache.commons.codec.binary.Hex import org.bitbucket.inkytonik.kiama.util.{Positions, Source} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import com.rawlabs.snapi.parser.generated.{SnapiParser, SnapiParserBaseVisitor} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import scala.collection.JavaConverters._ import scala.util.Try -class Rql2SnapiVisitor( +class SnapiVisitor( positions: Positions, private val source: Source, isFrontend: Boolean, - private val errors: Rql2VisitorParseErrors + private val errors: SnapiVisitorParseErrors ) extends SnapiParserBaseVisitor[SourceNode] { - private val positionsWrapper = new Rql2Positions(positions, source) + private val positionsWrapper = new SnapiPositions(positions, source) private val assertionMessage = "This is a helper (better grammar readability) node, should never visit it" - private def defaultProps: Set[Rql2TypeProperty] = - if (isFrontend) Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()) + private def defaultProps: Set[SnapiTypeProperty] = + if (isFrontend) Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()) else Set.empty private def getBrokenTypeCompletion(t: Option[Type], context: ParserRuleContext): Option[Type] = { @@ -61,7 +61,7 @@ class Rql2SnapiVisitor( override def visitProg(ctx: SnapiParser.ProgContext): SourceNode = Option(ctx) .flatMap(context => Option(context.stat)) .flatMap(statContext => Option(visit(statContext))) - .getOrElse(Rql2Program(Vector.empty, Option.empty)) + .getOrElse(SnapiProgram(Vector.empty, Option.empty)) override def visitFunDecStat(ctx: SnapiParser.FunDecStatContext): SourceNode = Option(ctx) .map { context => @@ -70,17 +70,17 @@ class Rql2SnapiVisitor( m.asScala.map(md => Option(md) .flatMap(mdContext => Option(visit(mdContext))) - .getOrElse(Rql2Method(FunProto(Vector.empty, Option.empty, FunBody(ErrorExp())), IdnDef(""))) - .asInstanceOf[Rql2Method] + .getOrElse(SnapiMethod(FunProto(Vector.empty, Option.empty, FunBody(ErrorExp())), IdnDef(""))) + .asInstanceOf[SnapiMethod] ) ) .getOrElse(Vector.empty) .toVector - val result = Rql2Program(methods, Option.empty) + val result = SnapiProgram(methods, Option.empty) positionsWrapper.setPosition(context, result) result } - .getOrElse(Rql2Program(Vector.empty, Option.empty)) + .getOrElse(SnapiProgram(Vector.empty, Option.empty)) override def visitFunDecExprStat(ctx: SnapiParser.FunDecExprStatContext): SourceNode = Option(ctx) .map { context => @@ -89,18 +89,18 @@ class Rql2SnapiVisitor( m.asScala.map(md => Option(md) .flatMap(mdContext => Option(visit(mdContext))) - .getOrElse(Rql2Method(FunProto(Vector.empty, Option.empty, FunBody(ErrorExp())), IdnDef(""))) - .asInstanceOf[Rql2Method] + .getOrElse(SnapiMethod(FunProto(Vector.empty, Option.empty, FunBody(ErrorExp())), IdnDef(""))) + .asInstanceOf[SnapiMethod] ) ) .getOrElse(Vector.empty) .toVector val me = Option(context.expr).map(expContext => Option(visit(expContext)).getOrElse(ErrorExp()).asInstanceOf[Exp]) - val result = Rql2Program(methods, me) + val result = SnapiProgram(methods, me) positionsWrapper.setPosition(context, result) result } - .getOrElse(Rql2Program(Vector.empty, Option.empty)) + .getOrElse(SnapiProgram(Vector.empty, Option.empty)) override def visitFun_proto(ctx: SnapiParser.Fun_protoContext): SourceNode = Option(ctx) .map { context => @@ -223,11 +223,11 @@ class Rql2SnapiVisitor( res } .getOrElse(IdnDef("")) - val result = Rql2Method(funProto, idnDef) + val result = SnapiMethod(funProto, idnDef) positionsWrapper.setPosition(context, result) result } - .getOrElse(Rql2Method(FunProto(Vector.empty, Option.empty, FunBody(ErrorExp())), IdnDef(""))) + .getOrElse(SnapiMethod(FunProto(Vector.empty, Option.empty, FunBody(ErrorExp())), IdnDef(""))) override def visitNormalFun(ctx: SnapiParser.NormalFunContext): SourceNode = Option(ctx) .map { context => @@ -337,11 +337,11 @@ class Rql2SnapiVisitor( val tipe = Option(context.tipe()) .map(tipeContext => Option(visit(tipeContext)).getOrElse(ErrorType()).asInstanceOf[Type]) .getOrElse(ErrorType()) - val result = Rql2AttrType(ident, tipe) + val result = SnapiAttrType(ident, tipe) positionsWrapper.setPosition(context, result) result } - .getOrElse(Rql2AttrType("", ErrorType())) + .getOrElse(SnapiAttrType("", ErrorType())) override def visitFunArgExpr(ctx: SnapiParser.FunArgExprContext): SourceNode = Option(ctx) .flatMap { context => @@ -477,14 +477,14 @@ class Rql2SnapiVisitor( .getOrElse(Vector.empty) val orType = Option(context.or_type()) .flatMap(orTypeContext => Option(visit(orTypeContext))) - .getOrElse(Rql2OrType(Vector(ErrorType()))) - .asInstanceOf[Rql2OrType] + .getOrElse(SnapiOrType(Vector(ErrorType()))) + .asInstanceOf[SnapiOrType] val combinedTypes = tipes ++ orType.tipes - val result = Rql2OrType(combinedTypes, defaultProps) + val result = SnapiOrType(combinedTypes, defaultProps) positionsWrapper.setPosition(context, result) result } - .getOrElse(Rql2OrType(Vector(ErrorType()))) + .getOrElse(SnapiOrType(Vector(ErrorType()))) // this one is helper, it doesn't need to set position (basically an accumulator for or_type) override def visitOr_type(ctx: SnapiParser.Or_typeContext): SourceNode = Option(ctx) @@ -495,9 +495,9 @@ class Rql2SnapiVisitor( .asInstanceOf[Type] val orType = Option(context.or_type()) .flatMap(orTypeContext => Option(visit(orTypeContext))) - .getOrElse(Rql2OrType(Vector.empty)) - .asInstanceOf[Rql2OrType] - Rql2OrType(Vector(tipe) ++ orType.tipes, defaultProps) + .getOrElse(SnapiOrType(Vector.empty)) + .asInstanceOf[SnapiOrType] + SnapiOrType(Vector(tipe) ++ orType.tipes, defaultProps) } .getOrElse(ErrorType()) @@ -509,10 +509,10 @@ class Rql2SnapiVisitor( val orType = Option(context.or_type()) .flatMap(orTypeContext => Option(visit(orTypeContext))) - .getOrElse(Rql2OrType(Vector.empty)) - .asInstanceOf[Rql2OrType] + .getOrElse(SnapiOrType(Vector.empty)) + .asInstanceOf[SnapiOrType] val combinedTypes = types ++ orType.tipes - val domainOrType = Rql2OrType(combinedTypes, defaultProps) + val domainOrType = SnapiOrType(combinedTypes, defaultProps) val rType = Option(context.tipe(1)) .flatMap(tipeContext => Option(visit(tipeContext))) .getOrElse(ErrorType()) @@ -531,14 +531,14 @@ class Rql2SnapiVisitor( override def visitRecordTypeType(ctx: SnapiParser.RecordTypeTypeContext): SourceNode = Option(ctx) .flatMap(context => Option(context.record_type).flatMap(recordTypeContext => Option(visit(recordTypeContext)))) .getOrElse(ErrorType()) - .asInstanceOf[Rql2RecordType] + .asInstanceOf[SnapiRecordType] override def visitIterableTypeType(ctx: SnapiParser.IterableTypeTypeContext): SourceNode = Option(ctx) .flatMap(context => Option(context.iterable_type).flatMap(iterableTypeContext => Option(visit(iterableTypeContext))) ) .getOrElse(ErrorType()) - .asInstanceOf[Rql2IterableType] + .asInstanceOf[SnapiIterableType] override def visitTypeWithParenType(ctx: SnapiParser.TypeWithParenTypeContext): SourceNode = Option(ctx) .flatMap(context => Option(context.tipe()).flatMap(tipeContext => Option(visit(tipeContext)))) @@ -555,22 +555,22 @@ class Rql2SnapiVisitor( override def visitPrimitive_types(ctx: SnapiParser.Primitive_typesContext): SourceNode = Option(ctx) .map { context => val result = - if (context.BOOL_TOKEN != null) Rql2BoolType(defaultProps) - else if (context.STRING_TOKEN != null) Rql2StringType(defaultProps) - else if (context.LOCATION_TOKEN != null) Rql2LocationType(defaultProps) - else if (context.BINARY_TOKEN != null) Rql2BinaryType(defaultProps) - else if (context.DATE_TOKEN != null) Rql2DateType(defaultProps) - else if (context.TIME_TOKEN != null) Rql2TimeType(defaultProps) - else if (context.INTERVAL_TOKEN != null) Rql2IntervalType(defaultProps) - else if (context.TIMESTAMP_TOKEN != null) Rql2TimestampType(defaultProps) - else if (context.BYTE_TOKEN != null) Rql2ByteType(defaultProps) - else if (context.SHORT_TOKEN != null) Rql2ShortType(defaultProps) - else if (context.INT_TOKEN != null) Rql2IntType(defaultProps) - else if (context.LONG_TOKEN != null) Rql2LongType(defaultProps) - else if (context.FLOAT_TOKEN != null) Rql2FloatType(defaultProps) - else if (context.DOUBLE_TOKEN != null) Rql2DoubleType(defaultProps) - else if (context.DECIMAL_TOKEN != null) Rql2DecimalType(defaultProps) - else if (context.UNDEFINED_TOKEN != null) Rql2UndefinedType(defaultProps) + if (context.BOOL_TOKEN != null) SnapiBoolType(defaultProps) + else if (context.STRING_TOKEN != null) SnapiStringType(defaultProps) + else if (context.LOCATION_TOKEN != null) SnapiLocationType(defaultProps) + else if (context.BINARY_TOKEN != null) SnapiBinaryType(defaultProps) + else if (context.DATE_TOKEN != null) SnapiDateType(defaultProps) + else if (context.TIME_TOKEN != null) SnapiTimeType(defaultProps) + else if (context.INTERVAL_TOKEN != null) SnapiIntervalType(defaultProps) + else if (context.TIMESTAMP_TOKEN != null) SnapiTimestampType(defaultProps) + else if (context.BYTE_TOKEN != null) SnapiByteType(defaultProps) + else if (context.SHORT_TOKEN != null) SnapiShortType(defaultProps) + else if (context.INT_TOKEN != null) SnapiIntType(defaultProps) + else if (context.LONG_TOKEN != null) SnapiLongType(defaultProps) + else if (context.FLOAT_TOKEN != null) SnapiFloatType(defaultProps) + else if (context.DOUBLE_TOKEN != null) SnapiDoubleType(defaultProps) + else if (context.DECIMAL_TOKEN != null) SnapiDecimalType(defaultProps) + else if (context.UNDEFINED_TOKEN != null) SnapiUndefinedType(defaultProps) else throw new AssertionError("Unknown primitive type") positionsWrapper.setPosition(context, result) result @@ -634,15 +634,15 @@ class Rql2SnapiVisitor( .map(a => Option(a) .flatMap(aContext => Option(visit(aContext))) - .getOrElse(Rql2AttrType("", ErrorType())) - .asInstanceOf[Rql2AttrType] + .getOrElse(SnapiAttrType("", ErrorType())) + .asInstanceOf[SnapiAttrType] ) .toVector ) } .getOrElse(Vector.empty) - val result = Rql2RecordType(atts, defaultProps) + val result = SnapiRecordType(atts, defaultProps) positionsWrapper.setPosition(context, result) result } @@ -655,7 +655,7 @@ class Rql2SnapiVisitor( .flatMap(tipeContext => Option(visit(tipeContext))) .getOrElse(ErrorType()) .asInstanceOf[Type] - val result = Rql2IterableType(tipe, defaultProps) + val result = SnapiIterableType(tipe, defaultProps) positionsWrapper.setPosition(context, result) result } @@ -667,7 +667,7 @@ class Rql2SnapiVisitor( .flatMap(tipeContext => Option(visit(tipeContext))) .getOrElse(ErrorType()) .asInstanceOf[Type] - val result = Rql2ListType(tipe, defaultProps) + val result = SnapiListType(tipe, defaultProps) positionsWrapper.setPosition(context, result) result } @@ -1342,18 +1342,20 @@ class Rql2SnapiVisitor( .flatMap(tipeContext => Option(visit(tipeContext))) .getOrElse(ErrorType()) tipe match { - case rql2TypeWithProperties: Rql2TypeWithProperties => Option(context.nullable_tryable()) + case snapiTypeWithProperties: SnapiTypeWithProperties => Option(context.nullable_tryable()) .map { nullableTryable => val withoutNullable = Option(nullableTryable.NULLABLE_TOKEN()) .map(_ => - rql2TypeWithProperties - .cloneAndAddProp(Rql2IsNullableTypeProperty()) - .asInstanceOf[Rql2TypeWithProperties] + snapiTypeWithProperties + .cloneAndAddProp(SnapiIsNullableTypeProperty()) + .asInstanceOf[SnapiTypeWithProperties] ) - .getOrElse(rql2TypeWithProperties) + .getOrElse(snapiTypeWithProperties) Option(nullableTryable.TRYABLE_TOKEN()) .map(_ => - withoutNullable.cloneAndAddProp(Rql2IsTryableTypeProperty()).asInstanceOf[Rql2TypeWithProperties] + withoutNullable + .cloneAndAddProp(SnapiIsTryableTypeProperty()) + .asInstanceOf[SnapiTypeWithProperties] ) .getOrElse(withoutNullable) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2VisitorParseErrors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiVisitorParseErrors.scala similarity index 88% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2VisitorParseErrors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiVisitorParseErrors.scala index 9ea3830d2..7fb63f5b9 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/antlr4/Rql2VisitorParseErrors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/antlr4/SnapiVisitorParseErrors.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.antlr4 +package com.rawlabs.snapi.frontend.snapi.antlr4 import com.rawlabs.compiler.Message import scala.collection.mutable -class Rql2VisitorParseErrors { +class SnapiVisitorParseErrors { private val errors = new mutable.ListBuffer[Message] diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/Errors.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/errors/Errors.scala similarity index 99% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/Errors.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/errors/Errors.scala index 9833cedc5..cafeadf76 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/Errors.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/errors/Errors.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.errors +package com.rawlabs.snapi.frontend.snapi.errors import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage import com.rawlabs.snapi.frontend.base.source.{BaseNode, Type} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/ErrorsPrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/errors/ErrorsPrettyPrinter.scala similarity index 93% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/ErrorsPrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/errors/ErrorsPrettyPrinter.scala index 550bb054e..12551af4b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/errors/ErrorsPrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/errors/ErrorsPrettyPrinter.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.errors +package com.rawlabs.snapi.frontend.snapi.errors import com.rawlabs.snapi.frontend.base.errors.{MissingSecretWarning, UnexpectedType} import com.rawlabs.snapi.frontend.base.source.BaseNode -import com.rawlabs.snapi.frontend.{base, rql2} -import com.rawlabs.snapi.frontend.rql2.source.{ExpectedProjType, PackageType} +import com.rawlabs.snapi.frontend.{base, snapi} +import com.rawlabs.snapi.frontend.snapi.source.{ExpectedProjType, PackageType} -trait ErrorsPrettyPrinter extends base.errors.ErrorsPrettyPrinter with rql2.source.SourcePrettyPrinter { +trait ErrorsPrettyPrinter extends base.errors.ErrorsPrettyPrinter with snapi.source.SourcePrettyPrinter { override def toDoc(n: BaseNode): Doc = n match { case _: KeyNotComparable => KeyNotComparable.message diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/EntryExtensionProvider.scala similarity index 98% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/EntryExtensionProvider.scala index 1a618f931..e3e8af05e 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/EntryExtensionProvider.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/EntryExtensionProvider.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions +package com.rawlabs.snapi.frontend.snapi.extensions -import com.rawlabs.snapi.frontend.rql2.extensions.builtin._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin._ object EntryExtensionProvider { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/LocationDescription.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/LocationDescription.scala similarity index 99% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/LocationDescription.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/LocationDescription.scala index aed3c9777..5aad712f0 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/LocationDescription.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/LocationDescription.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions +package com.rawlabs.snapi.frontend.snapi.extensions import com.rawlabs.utils.sources.api.Location import com.rawlabs.utils.sources.bytestream.github.GitHubLocation diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtension.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/PackageExtension.scala similarity index 79% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtension.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/PackageExtension.scala index 5d6c91914..54d8ea9e9 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtension.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/PackageExtension.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions +package com.rawlabs.snapi.frontend.snapi.extensions import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2TypeUtils, Rql2Value} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.{ProgramContext, SnapiTypeUtils, SnapiValue} import com.rawlabs.utils.sources.api._ import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation @@ -54,7 +54,7 @@ abstract class PackageExtension { } -final case class Rql2Arg(e: Exp, t: Type, idn: Option[String]) +final case class SnapiArg(e: Exp, t: Type, idn: Option[String]) abstract class EntryExtension extends EntryExtensionHelper { @@ -169,20 +169,20 @@ abstract class ShortEntryExtension( } -trait EntryExtensionHelper extends Rql2TypeUtils { +trait EntryExtensionHelper extends SnapiTypeUtils { /////////////////////////////////////////////////////////////////////////// // Value Helpers /////////////////////////////////////////////////////////////////////////// - final protected def getStringValue(v: Arg): String = { v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2StringValue].v } + final protected def getStringValue(v: Arg): String = { v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiStringValue].v } - final protected def getIntValue(v: Arg): Int = { v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2IntValue].v } + final protected def getIntValue(v: Arg): Int = { v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiIntValue].v } - final protected def getBoolValue(v: Arg): Boolean = { v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2BoolValue].v } + final protected def getBoolValue(v: Arg): Boolean = { v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiBoolValue].v } final protected def getByteStreamLocation(v: Arg): Either[String, ByteStreamLocation] = { - val locationValue = v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2LocationValue] + val locationValue = v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiLocationValue] locationValue.l match { case l: ByteStreamLocation => Right(l) case _ => Left("expected a bytestream") @@ -190,36 +190,36 @@ trait EntryExtensionHelper extends Rql2TypeUtils { } final protected def locationValueToExp(v: Arg): Exp = { - val locationValue = v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2LocationValue] + val locationValue = v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiLocationValue] val location = locationValue.l val locationDescription = LocationDescription.toLocationDescription(location) LocationConst(LocationDescription.serialize(locationDescription), locationValue.publicDescription) } final protected def getListStringValue(v: Arg): Seq[String] = { - v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2ListValue].v.map(v => v.asInstanceOf[Rql2StringValue].v) + v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiListValue].v.map(v => v.asInstanceOf[SnapiStringValue].v) } final protected def getListOptionStringValue(v: Arg): Seq[Option[String]] = { v .asInstanceOf[ValueArg] .v - .asInstanceOf[Rql2ListValue] + .asInstanceOf[SnapiListValue] .v - .map(v => v.asInstanceOf[Rql2OptionValue].v.map(_.asInstanceOf[Rql2StringValue].v)) + .map(v => v.asInstanceOf[SnapiOptionValue].v.map(_.asInstanceOf[SnapiStringValue].v)) } final protected def getListKVValue(v: Arg): Seq[(String, String)] = { val values = v .asInstanceOf[ValueArg] .v - .asInstanceOf[Rql2ListValue] + .asInstanceOf[SnapiListValue] .v .map { x => - val values = x.asInstanceOf[Rql2RecordValue].v.map { - case Rql2RecordAttr(_, Rql2OptionValue(Some(v: Rql2StringValue))) => Some(v.v) - case Rql2RecordAttr(_, Rql2StringValue(v)) => Some(v) - case Rql2RecordAttr(_, Rql2OptionValue(None)) => None + val values = x.asInstanceOf[SnapiRecordValue].v.map { + case SnapiRecordAttr(_, SnapiOptionValue(Some(v: SnapiStringValue))) => Some(v.v) + case SnapiRecordAttr(_, SnapiStringValue(v)) => Some(v) + case SnapiRecordAttr(_, SnapiOptionValue(None)) => None } (values(0), values(1)) } @@ -229,7 +229,7 @@ trait EntryExtensionHelper extends Rql2TypeUtils { final protected def getEncodingValue(v: Arg): Either[String, Encoding] = { Encoding - .fromEncodingString(v.asInstanceOf[ValueArg].v.asInstanceOf[Rql2StringValue].v) + .fromEncodingString(v.asInstanceOf[ValueArg].v.asInstanceOf[SnapiStringValue].v) } final protected def getMandatoryArgExp(mandatoryArgs: Seq[Arg], idx: Int): Exp = { @@ -248,24 +248,24 @@ trait EntryExtensionHelper extends Rql2TypeUtils { // Validator Helpers /////////////////////////////////////////////////////////////////////////// - protected def validateTableType(t: Type): Either[Seq[UnsupportedType], Rql2IterableType] = t match { - case Rql2IterableType(Rql2RecordType(atts, _), _) => + protected def validateTableType(t: Type): Either[Seq[UnsupportedType], SnapiIterableType] = t match { + case SnapiIterableType(SnapiRecordType(atts, _), _) => val validated = atts.map { x => x.tipe match { - case _: Rql2StringType => Right(x) - case _: Rql2BoolType => Right(x) - case _: Rql2NumberType => Right(x) - case _: Rql2DateType => Right(x) - case _: Rql2TimeType => Right(x) - case _: Rql2TimestampType => Right(x) - case _: Rql2BinaryType => Right(x) + case _: SnapiStringType => Right(x) + case _: SnapiBoolType => Right(x) + case _: SnapiNumberType => Right(x) + case _: SnapiDateType => Right(x) + case _: SnapiTimeType => Right(x) + case _: SnapiTimestampType => Right(x) + case _: SnapiBinaryType => Right(x) // intervals are not supported, so we cannot match temporal types here. case _ => Left(Seq(UnsupportedType(x.tipe, x.tipe, None))) } } val errors = validated.collect { case Left(error) => error } if (errors.nonEmpty) Left(errors.flatten) - else Right(Rql2IterableType(Rql2RecordType(atts))) + else Right(SnapiIterableType(SnapiRecordType(atts))) case _ => Left(Seq(UnsupportedType(t, t, None))) } @@ -276,29 +276,29 @@ trait EntryExtensionHelper extends Rql2TypeUtils { final val anything = AnythingType() // Primitive number types - final val byte = Rql2ByteType() - final val short = Rql2ShortType() - final val int = Rql2IntType() - final val long = Rql2LongType() - final val float = Rql2FloatType() - final val double = Rql2DoubleType() - final val decimal = Rql2DecimalType() + final val byte = SnapiByteType() + final val short = SnapiShortType() + final val int = SnapiIntType() + final val long = SnapiLongType() + final val float = SnapiFloatType() + final val double = SnapiDoubleType() + final val decimal = SnapiDecimalType() // Primitive temporal types - final val date = Rql2DateType() - final val time = Rql2TimeType() - final val interval = Rql2IntervalType() - final val timestamp = Rql2TimestampType() + final val date = SnapiDateType() + final val time = SnapiTimeType() + final val interval = SnapiIntervalType() + final val timestamp = SnapiTimestampType() // Primitive types - final val bool = Rql2BoolType() - final val string = Rql2StringType() - final val binary = Rql2BinaryType() - final val location = Rql2LocationType() + final val bool = SnapiBoolType() + final val string = SnapiStringType() + final val binary = SnapiBinaryType() + final val location = SnapiLocationType() // Collection types - final val iterable = Rql2IterableType(anything) - final val list = Rql2ListType(anything) + final val iterable = SnapiIterableType(anything) + final val list = SnapiListType(anything) // Number types constraints final val integer = OneOfType(byte, short, int, long) @@ -322,7 +322,7 @@ sealed trait Arg { } final case class ExpArg(e: Exp, t: Type) extends Arg final case class TypeArg(t: Type) extends Arg -final case class ValueArg(v: Rql2Value, t: Type) extends Arg +final case class ValueArg(v: SnapiValue, t: Type) extends Arg abstract class SugarEntryExtension extends EntryExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/PackageExtensionProvider.scala similarity index 90% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/PackageExtensionProvider.scala index 5855eeef0..e88c0c241 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/PackageExtensionProvider.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/PackageExtensionProvider.scala @@ -10,10 +10,10 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions +package com.rawlabs.snapi.frontend.snapi.extensions -import com.rawlabs.snapi.frontend.rql2.PackageEntity -import com.rawlabs.snapi.frontend.rql2.extensions.builtin._ +import com.rawlabs.snapi.frontend.snapi.PackageEntity +import com.rawlabs.snapi.frontend.snapi.extensions.builtin._ object PackageExtensionProvider { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/Aggregations.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/Aggregations.scala similarity index 67% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/Aggregations.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/Aggregations.scala index b818163d5..4fb014adf 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/Aggregations.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/Aggregations.scala @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.errors.ItemsNotComparable -import com.rawlabs.snapi.frontend.rql2.extensions.{EntryExtension, EntryExtensionHelper} -import com.rawlabs.snapi.frontend.rql2.source.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.errors.ItemsNotComparable +import com.rawlabs.snapi.frontend.snapi.extensions.{EntryExtension, EntryExtensionHelper} +import com.rawlabs.snapi.frontend.snapi.source.{ HasTypeProperties, IsNullable, - Rql2AttrType, - Rql2DecimalType, - Rql2IsNullableTypeProperty, - Rql2LongType, - Rql2RecordType + SnapiAttrType, + SnapiDecimalType, + SnapiIsNullableTypeProperty, + SnapiLongType, + SnapiRecordType } abstract class Aggregation extends EntryExtensionHelper { @@ -36,7 +36,7 @@ abstract class Aggregation extends EntryExtensionHelper { object SumAggregation extends Aggregation { - override val innerTypeConstraint: Type = OneOfType(number.tipes.map(addProp(_, Rql2IsNullableTypeProperty()))) + override val innerTypeConstraint: Type = OneOfType(number.tipes.map(addProp(_, SnapiIsNullableTypeProperty()))) override def aggregationType(t: Type): Either[String, Type] = Right(t) @@ -47,7 +47,7 @@ object MinAggregation extends Aggregation { override val innerTypeConstraint: Type = IsNullable() override def aggregationType(t: Type): Either[String, Type] = { - if (isComparable(t)) Right(resetProps(t, Set(Rql2IsNullableTypeProperty()))) + if (isComparable(t)) Right(resetProps(t, Set(SnapiIsNullableTypeProperty()))) else Left(ItemsNotComparable.message) } @@ -58,7 +58,7 @@ object MaxAggregation extends Aggregation { override val innerTypeConstraint: Type = IsNullable() override def aggregationType(t: Type): Either[String, Type] = { - if (isComparable(t)) Right(resetProps(t, Set(Rql2IsNullableTypeProperty()))) + if (isComparable(t)) Right(resetProps(t, Set(SnapiIsNullableTypeProperty()))) else Left(ItemsNotComparable.message) } @@ -66,17 +66,17 @@ object MaxAggregation extends Aggregation { object FirstAggregation extends Aggregation { - override val innerTypeConstraint: Type = HasTypeProperties(Set(Rql2IsNullableTypeProperty())) + override val innerTypeConstraint: Type = HasTypeProperties(Set(SnapiIsNullableTypeProperty())) - override def aggregationType(t: Type): Either[String, Type] = Right(addProp(t, Rql2IsNullableTypeProperty())) + override def aggregationType(t: Type): Either[String, Type] = Right(addProp(t, SnapiIsNullableTypeProperty())) } object LastAggregation extends Aggregation { - override val innerTypeConstraint: Type = HasTypeProperties(Set(Rql2IsNullableTypeProperty())) + override val innerTypeConstraint: Type = HasTypeProperties(Set(SnapiIsNullableTypeProperty())) - override def aggregationType(t: Type): Either[String, Type] = Right(addProp(t, Rql2IsNullableTypeProperty())) + override def aggregationType(t: Type): Either[String, Type] = Right(addProp(t, SnapiIsNullableTypeProperty())) } @@ -84,19 +84,19 @@ object CountAggregation extends Aggregation { override val innerTypeConstraint: Type = AnythingType() - override def aggregationType(t: Type): Either[String, Type] = Right(Rql2LongType()) + override def aggregationType(t: Type): Either[String, Type] = Right(SnapiLongType()) } object AvgAggregation extends Aggregation { - override val innerTypeConstraint: Type = OneOfType(number.tipes.map(t => addProp(t, Rql2IsNullableTypeProperty()))) + override val innerTypeConstraint: Type = OneOfType(number.tipes.map(t => addProp(t, SnapiIsNullableTypeProperty()))) override def aggregationType(t: Type): Either[String, Type] = Right( - Rql2RecordType( + SnapiRecordType( Vector( - Rql2AttrType("sum", addProp(Rql2DecimalType(), Rql2IsNullableTypeProperty())), - Rql2AttrType("count", Rql2LongType()) + SnapiAttrType("sum", addProp(SnapiDecimalType(), SnapiIsNullableTypeProperty())), + SnapiAttrType("count", SnapiLongType()) ) ) ) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/AwsPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/AwsPackage.scala similarity index 88% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/AwsPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/AwsPackage.scala index e3b613ca1..efc22d48f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/AwsPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/AwsPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ class AwsPackage extends PackageExtension { override def name: String = "Aws" @@ -95,11 +95,11 @@ class AwsV4SignedRequest extends EntryExtension { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "region" | "sessionToken" | "path" | "method" | "host" | "bodyString" => Right(ExpParam(Rql2StringType())) + case "region" | "sessionToken" | "path" | "method" | "host" | "bodyString" => Right(ExpParam(SnapiStringType())) case "args" | "headers" => Right( ExpParam( - Rql2ListType( - Rql2RecordType(Vector(Rql2AttrType("_1", Rql2StringType()), Rql2AttrType("_2", Rql2StringType()))) + SnapiListType( + SnapiRecordType(Vector(SnapiAttrType("_1", SnapiStringType()), SnapiAttrType("_2", SnapiStringType()))) ) ) ) @@ -107,13 +107,13 @@ class AwsV4SignedRequest extends EntryExtension { } override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] - )(implicit programContext: ProgramContext): Either[String, Type] = Right(Rql2LocationType()) + )(implicit programContext: ProgramContext): Either[String, Type] = Right(SnapiLocationType()) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BinaryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/BinaryPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BinaryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/BinaryPackage.scala index a41a75fa4..932c718be 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BinaryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/BinaryPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, ShortEntryExtension} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.snapi.source._ object BinaryPackageBuilder { @@ -40,7 +40,7 @@ class BinaryPackage extends PackageExtension { object BinaryPackage extends BinaryPackage { def outputWriteSupport(dataType: Type): Boolean = { - dataType.isInstanceOf[Rql2BinaryType] // nullable/tryable or not. All are supported + dataType.isInstanceOf[SnapiBinaryType] // nullable/tryable or not. All are supported } } @@ -48,8 +48,8 @@ class FromStringBinaryEntryExtension extends ShortEntryExtension( "Binary", "FromString", - Vector(Rql2StringType()), - Rql2BinaryType(), + Vector(SnapiStringType()), + SnapiBinaryType(), EntryDoc( "Converts a string into a binary.", params = List(ParamDoc("value", TypeDoc(List("string")), "The string to convert to binary.")), @@ -69,8 +69,8 @@ class BinaryReadEntry extends ShortEntryExtension( "Binary", "Read", - Vector(Rql2LocationType()), - Rql2BinaryType(Set(Rql2IsTryableTypeProperty())), + Vector(SnapiLocationType()), + SnapiBinaryType(Set(SnapiIsTryableTypeProperty())), EntryDoc( "Reads the contents of a location as a binary.", params = List(ParamDoc("value", TypeDoc(List("location")), "The location to read bytes from.")), @@ -89,8 +89,8 @@ class BinaryBase64Entry extends ShortEntryExtension( "Binary", "Base64", - Vector(Rql2BinaryType()), - Rql2StringType(), + Vector(SnapiBinaryType()), + SnapiStringType(), EntryDoc( "Encodes a binary value onto a base64 string.", params = List(ParamDoc("value", TypeDoc(List("binary")), "The binary to convert to a base64 string.")), diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BytePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/BytePackage.scala similarity index 81% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BytePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/BytePackage.scala index 2513cf4fd..11c1cbc71 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/BytePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/BytePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object BytePackageBuilder { @@ -81,11 +81,11 @@ class ByteFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2ByteType(props)) + Right(SnapiByteType(props)) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CollectionPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/CollectionPackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CollectionPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/CollectionPackage.scala index 9438eedf0..1bbed5f60 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CollectionPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/CollectionPackage.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -31,7 +31,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.errors.{ +import com.rawlabs.snapi.frontend.snapi.errors.{ InvalidOrderSpec, ItemsNotComparable, KeyNotComparable, @@ -199,7 +199,7 @@ class EmptyCollectionEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val TypeArg(t) = mandatoryArgs(0) - Right(Rql2IterableType(t)) + Right(SnapiIterableType(t)) } } @@ -240,11 +240,11 @@ class BuildCollectionEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { if (varArgs.isEmpty) { - Right(Rql2IterableType(Rql2UndefinedType())) + Right(SnapiIterableType(SnapiUndefinedType())) } else { val typesMerger = new TypesMerger val t = typesMerger.mergeType(varArgs.map(_.t): _*).get - Right(Rql2IterableType(t)) + Right(SnapiIterableType(t)) } } @@ -260,7 +260,7 @@ trait CollectionToListHint { this: EntryExtension => ): Option[String] = { idx match { case 0 => actual match { - case _: Rql2ListType => Some(s"did you mean List.$entryName?") + case _: SnapiListType => Some(s"did you mean List.$entryName?") case _ => None } case _ => None @@ -302,9 +302,9 @@ class FilterCollectionEntry extends EntryExtension with PredicateNormalization w override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -318,7 +318,7 @@ class FilterCollectionEntry extends EntryExtension with PredicateNormalization w ): Option[String] = { idx match { case 0 => actual match { - case _: Rql2ListType => Some("did you mean List.Filter?") + case _: SnapiListType => Some("did you mean List.Filter?") case _ => None } case _ => None @@ -364,14 +364,14 @@ class AvgCollectionEntry extends SugarEntryExtension with CollectionToListHint { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2IterableType(AvgAggregation.innerTypeConstraint))) + Right(ExpParam(SnapiIterableType(AvgAggregation.innerTypeConstraint))) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2DecimalType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))) + Right(SnapiDecimalType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))) } override def desugar( @@ -415,16 +415,16 @@ class OrderByCollectionEntry extends EntryExtension with CollectionToListHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2IterableType(AnythingType()))) + Right(ExpParam(SnapiIterableType(AnythingType()))) } override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = { - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") if (idx % 2 == 0) Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) - else Right(ValueParam(Rql2StringType())) + else Right(ValueParam(SnapiStringType())) } override def returnTypeErrorList( @@ -433,14 +433,14 @@ class OrderByCollectionEntry extends EntryExtension with CollectionToListHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val (orders, keyFunctions) = varArgs.partition(_.t.isInstanceOf[Rql2StringType]) + val (orders, keyFunctions) = varArgs.partition(_.t.isInstanceOf[SnapiStringType]) if (orders.size != keyFunctions.size) return Left(Seq(OrderSpecMustFollowOrderingFunction(node))) val keyErrors = for ( ExpArg(arg, FunType(_, _, keyType, _)) <- keyFunctions; if !isComparable(keyType) ) yield KeyNotComparable(arg) val orderErrors = for ( - ValueArg(value @ Rql2StringValue(order), _) <- orders; + ValueArg(value @ SnapiStringValue(order), _) <- orders; if !Set("ASC", "DESC").contains(order.toUpperCase) ) yield InvalidOrderSpec(node, order) val errors = keyErrors ++ orderErrors @@ -481,9 +481,9 @@ class TransformCollectionEntry extends EntryExtension with CollectionToListHint override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) } @@ -495,7 +495,7 @@ class TransformCollectionEntry extends EntryExtension with CollectionToListHint )(implicit programContext: ProgramContext): Either[String, Type] = { val FunType(_, _, outType, props) = mandatoryArgs(1).t assert(props.isEmpty, "Should have been handled as per arg 1 definition") - Right(Rql2IterableType(outType)) + Right(SnapiIterableType(outType)) } } @@ -529,7 +529,7 @@ class DistinctCollectionEntry extends EntryExtension with CollectionToListHint { super.getVarParam(prevMandatoryArgs, prevVarArgs, idx) override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2IterableType(AnythingType()))) + Right(ExpParam(SnapiIterableType(AnythingType()))) } override def returnTypeErrorList( @@ -538,7 +538,7 @@ class DistinctCollectionEntry extends EntryExtension with CollectionToListHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val ExpArg(list, Rql2IterableType(itemType, _)) = mandatoryArgs(0) + val ExpArg(list, SnapiIterableType(itemType, _)) = mandatoryArgs(0) if (isComparable(itemType)) Right(mandatoryArgs(0).t) else Left(Seq(ItemsNotComparable(list))) } @@ -549,7 +549,7 @@ abstract class AggregationCollectionEntry(aggregation: Aggregation) extends Aggr override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2IterableType(aggregation.innerTypeConstraint))) + Right(ExpParam(SnapiIterableType(aggregation.innerTypeConstraint))) } override def returnTypeErrorList( @@ -570,8 +570,8 @@ abstract class AggregationCollectionEntry(aggregation: Aggregation) extends Aggr optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2IterableType(innerType, _) = mandatoryArgs.head.t - aggregation.aggregationType(innerType).right.map(t => addProp(t, Rql2IsTryableTypeProperty())) + val SnapiIterableType(innerType, _) = mandatoryArgs.head.t + aggregation.aggregationType(innerType).right.map(t => addProp(t, SnapiIsTryableTypeProperty())) } } @@ -713,9 +713,9 @@ class FindFirstCollectionEntry extends SugarEntryExtension with PredicateNormali override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -726,8 +726,8 @@ class FindFirstCollectionEntry extends SugarEntryExtension with PredicateNormali optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2IterableType(itemType, _)) = mandatoryArgs(0) - Right(addProps(itemType, Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty()))) + val ExpArg(_, SnapiIterableType(itemType, _)) = mandatoryArgs(0) + Right(addProps(itemType, Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty()))) } override def desugar( @@ -791,9 +791,9 @@ class FindLastCollectionEntry extends SugarEntryExtension with PredicateNormaliz override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -804,8 +804,8 @@ class FindLastCollectionEntry extends SugarEntryExtension with PredicateNormaliz optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2IterableType(itemType, _)) = mandatoryArgs(0) - Right(addProps(itemType, Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty()))) + val ExpArg(_, SnapiIterableType(itemType, _)) = mandatoryArgs(0) + Right(addProps(itemType, Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty()))) } override def desugar( @@ -844,8 +844,8 @@ class TakeCollectionEntry extends EntryExtension with CollectionToListHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) - case 1 => Right(ExpParam(Rql2LongType())) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) + case 1 => Right(ExpParam(SnapiLongType())) } } @@ -932,9 +932,9 @@ class ExplodeCollectionEntry extends SugarEntryExtension with RecordMerging with override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right( ExpParam( @@ -942,10 +942,10 @@ class ExplodeCollectionEntry extends SugarEntryExtension with RecordMerging with Vector(innerType), Vector.empty, OneOfType( - Rql2IterableType(AnythingType()), - Rql2IterableType(AnythingType(), Set(Rql2IsNullableTypeProperty())), - Rql2IterableType(AnythingType(), Set(Rql2IsTryableTypeProperty())), - Rql2IterableType(AnythingType(), Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) + SnapiIterableType(AnythingType()), + SnapiIterableType(AnythingType(), Set(SnapiIsNullableTypeProperty())), + SnapiIterableType(AnythingType(), Set(SnapiIsTryableTypeProperty())), + SnapiIterableType(AnythingType(), Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) ) ) ) @@ -958,10 +958,10 @@ class ExplodeCollectionEntry extends SugarEntryExtension with RecordMerging with optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2IterableType(leftRowType, props)) = mandatoryArgs(0) - val ExpArg(_, FunType(_, _, Rql2IterableType(rightRowType, _), _)) = mandatoryArgs(1) - val outRowType = rql2JoinOutputRowType(leftRowType, rightRowType) - Right(Rql2IterableType(outRowType, props)) + val ExpArg(_, SnapiIterableType(leftRowType, props)) = mandatoryArgs(0) + val ExpArg(_, FunType(_, _, SnapiIterableType(rightRowType, _), _)) = mandatoryArgs(1) + val outRowType = snapiJoinOutputRowType(leftRowType, rightRowType) + Right(SnapiIterableType(outRowType, props)) } override def desugar( @@ -971,8 +971,8 @@ class ExplodeCollectionEntry extends SugarEntryExtension with RecordMerging with optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Exp = { - val ExpArg(in, Rql2IterableType(leftRowType, _)) = mandatoryArgs(0) - val ExpArg(f, FunType(_, _, Rql2IterableType(rightRowType, _), _)) = mandatoryArgs(1) + val ExpArg(in, SnapiIterableType(leftRowType, _)) = mandatoryArgs(0) + val ExpArg(f, FunType(_, _, SnapiIterableType(rightRowType, _), _)) = mandatoryArgs(1) val leftIdn = IdnDef() val unnestedMerge = { val rightIdn = IdnDef() @@ -983,7 +983,7 @@ class ExplodeCollectionEntry extends SugarEntryExtension with RecordMerging with FunProto( Vector(FunParam(rightIdn, None, None)), None, - FunBody(rql2JoinRowsConcatenation(IdnExp(leftIdn), leftRowType, IdnExp(rightIdn), rightRowType)) + FunBody(snapiJoinRowsConcatenation(IdnExp(leftIdn), leftRowType, IdnExp(rightIdn), rightRowType)) ) ) ) @@ -1006,9 +1006,9 @@ class UnnestCollectionEntry extends EntryExtension with CollectionToListHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right( ExpParam( @@ -1016,10 +1016,10 @@ class UnnestCollectionEntry extends EntryExtension with CollectionToListHint { Vector(innerType), Vector.empty, OneOfType( - Rql2IterableType(AnythingType()), - Rql2IterableType(AnythingType(), Set(Rql2IsNullableTypeProperty())), - Rql2IterableType(AnythingType(), Set(Rql2IsTryableTypeProperty())), - Rql2IterableType(AnythingType(), Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) + SnapiIterableType(AnythingType()), + SnapiIterableType(AnythingType(), Set(SnapiIsNullableTypeProperty())), + SnapiIterableType(AnythingType(), Set(SnapiIsTryableTypeProperty())), + SnapiIterableType(AnythingType(), Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) ) ) ) @@ -1032,10 +1032,10 @@ class UnnestCollectionEntry extends EntryExtension with CollectionToListHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2IterableType(_, props) = mandatoryArgs(0).t + val SnapiIterableType(_, props) = mandatoryArgs(0).t assert(props.isEmpty, "Should have been handled as per arg 1 definition") - val FunType(_, _, Rql2IterableType(outputRowType, _), _) = mandatoryArgs(1).t - Right(Rql2IterableType(outputRowType)) + val FunType(_, _, SnapiIterableType(outputRowType, _), _) = mandatoryArgs(1).t + Right(SnapiIterableType(outputRowType)) } } @@ -1058,7 +1058,7 @@ class FromCollectionEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2ListType(AnythingType()))) + Right(ExpParam(SnapiListType(AnythingType()))) } override def returnType( @@ -1066,8 +1066,8 @@ class FromCollectionEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2ListType(itemType, _)) = mandatoryArgs(0) - Right(Rql2IterableType(itemType)) + val ExpArg(_, SnapiListType(itemType, _)) = mandatoryArgs(0) + Right(SnapiIterableType(itemType)) } } @@ -1100,9 +1100,9 @@ class GroupCollectionEntry extends EntryExtension with CollectionToListHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) } @@ -1118,11 +1118,11 @@ class GroupCollectionEntry extends EntryExtension with CollectionToListHint { val ExpArg(keyFunction, FunType(_, _, keyType, props)) = mandatoryArgs(1) assert(props.isEmpty, "Should have been handled as per arg 1 definition") if (isComparable(keyType)) Right( - Rql2IterableType( - Rql2RecordType( + SnapiIterableType( + SnapiRecordType( Vector( - Rql2AttrType("key", keyType), - Rql2AttrType("group", listType) + SnapiAttrType("key", keyType), + SnapiAttrType("group", listType) ) ) ) @@ -1185,11 +1185,11 @@ class JoinCollectionEntry override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 | 1 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 | 1 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 2 => - val ExpArg(_, Rql2IterableType(leftRowType, _)) = prevMandatoryArgs(0) - val ExpArg(_, Rql2IterableType(rightRowType, _)) = prevMandatoryArgs(1) - val outType = rql2JoinOutputRowType(leftRowType, rightRowType) + val ExpArg(_, SnapiIterableType(leftRowType, _)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(rightRowType, _)) = prevMandatoryArgs(1) + val outType = snapiJoinOutputRowType(leftRowType, rightRowType) Right(ExpParam(OneOfType(flexiblePredicateOn(outType), flexiblePredicateOn(Vector(leftRowType, rightRowType))))) } } @@ -1199,10 +1199,10 @@ class JoinCollectionEntry optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2IterableType(leftRowType, _)) = mandatoryArgs(0) - val ExpArg(_, Rql2IterableType(rightRowType, _)) = mandatoryArgs(1) - val outType = rql2JoinOutputRowType(leftRowType, rightRowType) - Right(Rql2IterableType(outType)) + val ExpArg(_, SnapiIterableType(leftRowType, _)) = mandatoryArgs(0) + val ExpArg(_, SnapiIterableType(rightRowType, _)) = mandatoryArgs(1) + val outType = snapiJoinOutputRowType(leftRowType, rightRowType) + Right(SnapiIterableType(outType)) } override def desugar( @@ -1213,11 +1213,11 @@ class JoinCollectionEntry varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Exp = { val remapF = { - val Rql2IterableType(leftRowType, _) = mandatoryArgs(0).t - val Rql2IterableType(rightRowType, _) = mandatoryArgs(1).t + val SnapiIterableType(leftRowType, _) = mandatoryArgs(0).t + val SnapiIterableType(rightRowType, _) = mandatoryArgs(1).t val leftIdn = IdnDef() val rightIdn = IdnDef() - val concatenation = rql2JoinRowsConcatenation(IdnExp(leftIdn), leftRowType, IdnExp(rightIdn), rightRowType) + val concatenation = snapiJoinRowsConcatenation(IdnExp(leftIdn), leftRowType, IdnExp(rightIdn), rightRowType) FunAbs( FunProto( Vector(FunParam(leftIdn, None, None), FunParam(rightIdn, None, None)), @@ -1243,14 +1243,14 @@ class InternalJoinCollectionEntry extends EntryExtension with PredicateNormaliza override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 | 1 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 | 1 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 2 => - val ExpArg(_, Rql2IterableType(leftRowType, _)) = prevMandatoryArgs(0) - val ExpArg(_, Rql2IterableType(rightRowType, _)) = prevMandatoryArgs(1) + val ExpArg(_, SnapiIterableType(leftRowType, _)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(rightRowType, _)) = prevMandatoryArgs(1) Right(ExpParam(FunType(Vector(leftRowType, rightRowType), Vector.empty, AnythingType()))) case 3 => - val ExpArg(_, Rql2IterableType(leftRowType, _)) = prevMandatoryArgs(0) - val ExpArg(_, Rql2IterableType(rightRowType, _)) = prevMandatoryArgs(1) + val ExpArg(_, SnapiIterableType(leftRowType, _)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(rightRowType, _)) = prevMandatoryArgs(1) val ExpArg(_, FunType(_, _, outType, _)) = prevMandatoryArgs(2) Right(ExpParam(OneOfType(flexiblePredicateOn(outType), flexiblePredicateOn(Vector(leftRowType, rightRowType))))) } @@ -1262,7 +1262,7 @@ class InternalJoinCollectionEntry extends EntryExtension with PredicateNormaliza varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val ExpArg(_, FunType(_, _, outType, _)) = mandatoryArgs(2) - Right(Rql2IterableType(outType)) + Right(SnapiIterableType(outType)) } } @@ -1309,12 +1309,12 @@ class EquiJoinCollectionEntry extends SugarEntryExtension with RecordMerging wit override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 | 1 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 | 1 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 2 => - val ExpArg(_, Rql2IterableType(innerType, _)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, _)) = prevMandatoryArgs(0) Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) case 3 => - val ExpArg(_, Rql2IterableType(innerType, _)) = prevMandatoryArgs(1) + val ExpArg(_, SnapiIterableType(innerType, _)) = prevMandatoryArgs(1) val ExpArg(_, FunType(_, _, kType, _)) = prevMandatoryArgs(2) Right(ExpParam(FunType(Vector(innerType), Vector.empty, MergeableType(kType)))) } @@ -1326,14 +1326,14 @@ class EquiJoinCollectionEntry extends SugarEntryExtension with RecordMerging wit optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val ExpArg(_, Rql2IterableType(leftRowType, _)) = mandatoryArgs(0) - val ExpArg(_, Rql2IterableType(rightRowType, _)) = mandatoryArgs(1) + val ExpArg(_, SnapiIterableType(leftRowType, _)) = mandatoryArgs(0) + val ExpArg(_, SnapiIterableType(rightRowType, _)) = mandatoryArgs(1) val ExpArg(keyFunction1, FunType(_, _, keyType1, _)) = mandatoryArgs(2) val ExpArg(keyFunction2, FunType(_, _, keyType2, _)) = mandatoryArgs(3) if (isComparable(keyType1)) { if (isComparable(keyType2)) { - val mergedRecordType = rql2JoinOutputRowType(leftRowType, rightRowType) - Right(Rql2IterableType(mergedRecordType)) + val mergedRecordType = snapiJoinOutputRowType(leftRowType, rightRowType) + Right(SnapiIterableType(mergedRecordType)) } else Left(Seq(KeyNotComparable(keyFunction2))) } else Left(Seq(KeyNotComparable(keyFunction1))) } @@ -1345,12 +1345,12 @@ class EquiJoinCollectionEntry extends SugarEntryExtension with RecordMerging wit optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Exp = { - val Rql2IterableType(leftRowType, _) = mandatoryArgs(0).t - val Rql2IterableType(rightRowType, _) = mandatoryArgs(1).t + val SnapiIterableType(leftRowType, _) = mandatoryArgs(0).t + val SnapiIterableType(rightRowType, _) = mandatoryArgs(1).t val remapF = { val leftIdn = IdnDef() val rightIdn = IdnDef() - val concatenation = rql2JoinRowsConcatenation(IdnExp(leftIdn), leftRowType, IdnExp(rightIdn), rightRowType) + val concatenation = snapiJoinRowsConcatenation(IdnExp(leftIdn), leftRowType, IdnExp(rightIdn), rightRowType) FunAbs( FunProto( Vector(FunParam(leftIdn, None, None), FunParam(rightIdn, None, None)), @@ -1400,20 +1400,20 @@ class InternalEquiJoinCollectionEntry extends EntryExtension with RecordMerging idx match { case 0 | 1 => // input datasets - Right(ExpParam(Rql2IterableType(AnythingType()))) + Right(ExpParam(SnapiIterableType(AnythingType()))) case 2 => // left key function - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) case 3 => // right key function (output type = left key function output type) - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(1) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(1) val ExpArg(_, FunType(_, _, kType, _)) = prevMandatoryArgs(2) Right(ExpParam(FunType(Vector(innerType), Vector.empty, kType))) case 4 => // remap function (in general concatenation of the two rows) - val ExpArg(_, Rql2IterableType(leftRowType, _)) = prevMandatoryArgs(0) - val ExpArg(_, Rql2IterableType(rightRowType, _)) = prevMandatoryArgs(1) + val ExpArg(_, SnapiIterableType(leftRowType, _)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(rightRowType, _)) = prevMandatoryArgs(1) Right(ExpParam(FunType(Vector(leftRowType, rightRowType), Vector.empty, AnythingType()))) } @@ -1425,7 +1425,7 @@ class InternalEquiJoinCollectionEntry extends EntryExtension with RecordMerging varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val ExpArg(_, FunType(_, _, remapType, _)) = mandatoryArgs(4) - Right(Rql2IterableType(remapType)) + Right(SnapiIterableType(remapType)) } } @@ -1453,10 +1453,10 @@ class UnionCollectionEntry extends EntryExtension with CollectionToListHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(rowType, _)) = prevMandatoryArgs(0) - Right(ExpParam(Rql2IterableType(MergeableType(rowType)))) + val ExpArg(_, SnapiIterableType(rowType, _)) = prevMandatoryArgs(0) + Right(ExpParam(SnapiIterableType(MergeableType(rowType)))) } } @@ -1465,8 +1465,8 @@ class UnionCollectionEntry extends EntryExtension with CollectionToListHint { prevVarArgs: Seq[Arg], idx: Int ): Either[String, Param] = { - val ExpArg(_, Rql2IterableType(rowType, _)) = prevMandatoryArgs(0) - Right(ExpParam(Rql2IterableType(MergeableType(rowType)))) + val ExpArg(_, SnapiIterableType(rowType, _)) = prevMandatoryArgs(0) + Right(ExpParam(SnapiIterableType(MergeableType(rowType)))) } override def returnType( @@ -1484,19 +1484,19 @@ class UnionCollectionEntry extends EntryExtension with CollectionToListHint { trait RecordMerging { - protected def rql2JoinRowsConcatenation(leftRow: Exp, leftRowType: Type, rightRow: Exp, rightRowType: Type): Exp = { + protected def snapiJoinRowsConcatenation(leftRow: Exp, leftRowType: Type, rightRow: Exp, rightRowType: Type): Exp = { def merge(leftRowType: Type, rightRowType: Type): Exp = (leftRowType, rightRowType) match { - case (_: Rql2RecordType, _: Rql2RecordType) => + case (_: SnapiRecordType, _: SnapiRecordType) => // Two records, concatenate the fields RecordPackageBuilder.Concat(leftRow, rightRow) - case (rec: Rql2RecordType, _) => + case (rec: SnapiRecordType, _) => // right isn't a record. Its value goes as rightmost field. - val Rql2RecordType(atts, _) = rql2JoinOutputRowType(leftRowType, rightRowType) + val SnapiRecordType(atts, _) = snapiJoinOutputRowType(leftRowType, rightRowType) val idn = atts.last.idn RecordPackageBuilder.AddField(leftRow, rightRow, idn) - case (_, rec: Rql2RecordType) => + case (_, rec: SnapiRecordType) => // left isn't a record. Its value goes are leftmost field. - val Rql2RecordType(atts, _) = rql2JoinOutputRowType(leftRowType, rightRowType) + val SnapiRecordType(atts, _) = snapiJoinOutputRowType(leftRowType, rightRowType) val idn = atts.head.idn RecordPackageBuilder.Concat(RecordPackageBuilder.Build(Vector((idn, leftRow))), rightRow) case _ => @@ -1505,21 +1505,21 @@ trait RecordMerging { } merge(leftRowType, rightRowType) } - protected def rql2JoinOutputRowType(leftRowType: Type, rightRowType: Type): Rql2RecordType = + protected def snapiJoinOutputRowType(leftRowType: Type, rightRowType: Type): SnapiRecordType = (leftRowType, rightRowType) match { - case (Rql2RecordType(leftAtts, leftProps), Rql2RecordType(rightAtts, rightProps)) => + case (SnapiRecordType(leftAtts, leftProps), SnapiRecordType(rightAtts, rightProps)) => // both are records, merge attributes and properties (how Record.Concat behaves) - Rql2RecordType(leftAtts ++ rightAtts, leftProps ++ rightProps) - case (Rql2RecordType(atts, props), _) => + SnapiRecordType(leftAtts ++ rightAtts, leftProps ++ rightProps) + case (SnapiRecordType(atts, props), _) => val others = atts.map(_.idn).toSet val idn = (1 to (others.size + 1)).map("_" + _).find(!others.contains(_)).head - Rql2RecordType(atts :+ Rql2AttrType(idn, rightRowType), props) - case (_, Rql2RecordType(atts, props)) => + SnapiRecordType(atts :+ SnapiAttrType(idn, rightRowType), props) + case (_, SnapiRecordType(atts, props)) => // left isn't a record. Add it as a front extra column val others = atts.map(_.idn).toSet val idn = (1 to (others.size + 1)).map("_" + _).find(!others.contains(_)).head - Rql2RecordType(Rql2AttrType(idn, leftRowType) +: atts, props) - case _ => Rql2RecordType(Vector(Rql2AttrType("_1", leftRowType), Rql2AttrType("_2", rightRowType))) + SnapiRecordType(SnapiAttrType(idn, leftRowType) +: atts, props) + case _ => SnapiRecordType(Vector(SnapiAttrType("_1", leftRowType), SnapiAttrType("_2", rightRowType))) } } @@ -1530,10 +1530,10 @@ trait PredicateNormalization { outTypes, Vector.empty, OneOfType( - Rql2BoolType(), - Rql2BoolType(Set(Rql2IsNullableTypeProperty())), - Rql2BoolType(Set(Rql2IsTryableTypeProperty())), - Rql2BoolType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) + SnapiBoolType(), + SnapiBoolType(Set(SnapiIsNullableTypeProperty())), + SnapiBoolType(Set(SnapiIsTryableTypeProperty())), + SnapiBoolType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) ) ) @@ -1578,9 +1578,9 @@ class ExistsCollectionEntry extends EntryExtension with PredicateNormalization w override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, props)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, props)) = prevMandatoryArgs(0) assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right( ExpParam( @@ -1588,10 +1588,10 @@ class ExistsCollectionEntry extends EntryExtension with PredicateNormalization w Vector(innerType), Vector.empty, OneOfType( - Rql2BoolType(), - Rql2BoolType(Set(Rql2IsNullableTypeProperty())), - Rql2BoolType(Set(Rql2IsTryableTypeProperty())), - Rql2BoolType(Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) + SnapiBoolType(), + SnapiBoolType(Set(SnapiIsNullableTypeProperty())), + SnapiBoolType(Set(SnapiIsTryableTypeProperty())), + SnapiBoolType(Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) ) ) ) @@ -1604,7 +1604,7 @@ class ExistsCollectionEntry extends EntryExtension with PredicateNormalization w optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2BoolType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiBoolType(Set(SnapiIsTryableTypeProperty()))) } } @@ -1639,9 +1639,9 @@ class ContainsCollectionEntry extends SugarEntryExtension with CollectionToListH override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2IterableType(AnythingType()))) + case 0 => Right(ExpParam(SnapiIterableType(AnythingType()))) case 1 => - val ExpArg(_, Rql2IterableType(innerType, _)) = prevMandatoryArgs(0) + val ExpArg(_, SnapiIterableType(innerType, _)) = prevMandatoryArgs(0) Right(ExpParam(innerType)) } } @@ -1652,8 +1652,8 @@ class ContainsCollectionEntry extends SugarEntryExtension with CollectionToListH optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val ExpArg(items, Rql2IterableType(itemType, _)) = mandatoryArgs(0) - if (isComparable(itemType)) Right(Rql2BoolType(Set(Rql2IsTryableTypeProperty()))) + val ExpArg(items, SnapiIterableType(itemType, _)) = mandatoryArgs(0) + if (isComparable(itemType)) Right(SnapiBoolType(Set(SnapiIsTryableTypeProperty()))) else Left(Seq(ItemsNotComparable(items))) } @@ -1706,7 +1706,7 @@ class ZipCollectionEntry extends EntryExtension with CollectionToListHint { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2IterableType(AnythingType()))) + Right(ExpParam(SnapiIterableType(AnythingType()))) } override def returnType( @@ -1714,9 +1714,9 @@ class ZipCollectionEntry extends EntryExtension with CollectionToListHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2IterableType(itemType1, _) = mandatoryArgs(0).t - val Rql2IterableType(itemType2, _) = mandatoryArgs(1).t - Right(Rql2IterableType(Rql2RecordType(Vector(Rql2AttrType("_1", itemType1), Rql2AttrType("_2", itemType2))))) + val SnapiIterableType(itemType1, _) = mandatoryArgs(0).t + val SnapiIterableType(itemType2, _) = mandatoryArgs(1).t + Right(SnapiIterableType(SnapiRecordType(Vector(SnapiAttrType("_1", itemType1), SnapiAttrType("_2", itemType2))))) } } @@ -1755,14 +1755,14 @@ class MkStringCollectionEntry extends EntryExtension with CollectionToListHint { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - if (idx == 0) Right(ExpParam(Rql2IterableType(Rql2StringType(Set(Rql2IsNullableTypeProperty()))))) - else Right(ExpParam(Rql2StringType())) + if (idx == 0) Right(ExpParam(SnapiIterableType(SnapiStringType(Set(SnapiIsNullableTypeProperty()))))) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("start", "sep", "end")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -1770,7 +1770,7 @@ class MkStringCollectionEntry extends EntryExtension with CollectionToListHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiStringType(Set(SnapiIsTryableTypeProperty()))) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CsvPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/CsvPackage.scala similarity index 84% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CsvPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/CsvPackage.scala index 9c4d3d103..53314e698 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/CsvPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/CsvPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, EntryExtensionHelper, @@ -46,10 +46,10 @@ object CsvPackage extends CsvPackage { def outputWriteSupport(dataType: Type): Boolean = { val innerRecordType = dataType match { - case Rql2IterableType(rType: Rql2RecordType, iProps) => + case SnapiIterableType(rType: SnapiRecordType, iProps) => if (iProps.nonEmpty) return false; rType - case Rql2ListType(rType: Rql2RecordType, iProps) => + case SnapiListType(rType: SnapiRecordType, iProps) => if (iProps.nonEmpty) return false; rType case _ => return false @@ -58,20 +58,20 @@ object CsvPackage extends CsvPackage { def validColumnType(value: Type): Boolean = { value match { - case _: Rql2ByteType => true - case _: Rql2ShortType => true - case _: Rql2IntType => true - case _: Rql2LongType => true - case _: Rql2FloatType => true - case _: Rql2DoubleType => true - case _: Rql2DecimalType => true - case _: Rql2StringType => true - case _: Rql2BoolType => true - case _: Rql2DateType => true - case _: Rql2TimeType => true - case _: Rql2TimestampType => true - case _: Rql2IntervalType => true - case _: Rql2BinaryType => true + case _: SnapiByteType => true + case _: SnapiShortType => true + case _: SnapiIntType => true + case _: SnapiLongType => true + case _: SnapiFloatType => true + case _: SnapiDoubleType => true + case _: SnapiDecimalType => true + case _: SnapiStringType => true + case _: SnapiBoolType => true + case _: SnapiDateType => true + case _: SnapiTimeType => true + case _: SnapiTimestampType => true + case _: SnapiIntervalType => true + case _: SnapiBinaryType => true case _ => false } } @@ -175,7 +175,7 @@ class CsvInferAndReadEntry extends SugarEntryExtension with CsvEntryExtensionHel override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ValueParam(Rql2LocationType())) + Right(ValueParam(SnapiLocationType())) } override def optionalParams: Option[Set[String]] = Some( @@ -195,16 +195,16 @@ class CsvInferAndReadEntry extends SugarEntryExtension with CsvEntryExtensionHel override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "sampleSize" => Right(ValueParam(Rql2IntType())) - case "encoding" => Right(ValueParam(Rql2StringType())) - case "hasHeader" => Right(ValueParam(Rql2BoolType())) - case "delimiters" => Right(ValueParam(Rql2ListType(Rql2StringType()))) - case "nulls" => Right(ValueParam(Rql2ListType(Rql2StringType()))) - case "nans" => Right(ValueParam(Rql2ListType(Rql2StringType()))) - case "skip" => Right(ValueParam(Rql2IntType())) - case "escape" => Right(ValueParam(Rql2StringType())) - case "quotes" => Right(ValueParam(Rql2ListType(Rql2StringType(Set(Rql2IsNullableTypeProperty()))))) - case "preferNulls" => Right(ValueParam(Rql2BoolType())) + case "sampleSize" => Right(ValueParam(SnapiIntType())) + case "encoding" => Right(ValueParam(SnapiStringType())) + case "hasHeader" => Right(ValueParam(SnapiBoolType())) + case "delimiters" => Right(ValueParam(SnapiListType(SnapiStringType()))) + case "nulls" => Right(ValueParam(SnapiListType(SnapiStringType()))) + case "nans" => Right(ValueParam(SnapiListType(SnapiStringType()))) + case "skip" => Right(ValueParam(SnapiIntType())) + case "escape" => Right(ValueParam(SnapiStringType())) + case "quotes" => Right(ValueParam(SnapiListType(SnapiStringType(Set(SnapiIsNullableTypeProperty()))))) + case "preferNulls" => Right(ValueParam(SnapiBoolType())) } } @@ -241,10 +241,10 @@ class CsvInferAndReadEntry extends SugarEntryExtension with CsvEntryExtensionHel val makeNullables = sampled && preferNulls val makeTryables = sampled - val convertedAtts = atts.map(x => Rql2AttrType(x.idn, inferTypeToRql2Type(x.tipe, makeNullables, makeTryables))) + val convertedAtts = atts.map(x => SnapiAttrType(x.idn, inferTypeToSnapiType(x.tipe, makeNullables, makeTryables))) // Here we are making the record not nullable and not tryable. - Rql2IterableType(Rql2RecordType(convertedAtts)) + SnapiIterableType(SnapiRecordType(convertedAtts)) } } @@ -402,7 +402,7 @@ class CsvReadEntry extends EntryExtension with CsvEntryExtensionHelper { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2LocationType())) + case 0 => Right(ExpParam(SnapiLocationType())) case 1 => // We check valid types in return type instead, since it's easier to express there, as we do not // have a specific constraint. @@ -427,16 +427,16 @@ class CsvReadEntry extends EntryExtension with CsvEntryExtensionHelper { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "encoding" => Right(ExpParam(Rql2StringType())) - case "skip" => Right(ExpParam(Rql2IntType())) - case "delimiter" => Right(ExpParam(Rql2StringType())) - case "escape" => Right(ExpParam(Rql2StringType(Set(Rql2IsNullableTypeProperty())))) - case "quote" => Right(ExpParam(Rql2StringType(Set(Rql2IsNullableTypeProperty())))) - case "nulls" => Right(ExpParam(Rql2ListType(Rql2StringType()))) - case "nans" => Right(ExpParam(Rql2ListType(Rql2StringType()))) - case "timeFormat" => Right(ExpParam(Rql2StringType())) - case "dateFormat" => Right(ExpParam(Rql2StringType())) - case "timestampFormat" => Right(ExpParam(Rql2StringType())) + case "encoding" => Right(ExpParam(SnapiStringType())) + case "skip" => Right(ExpParam(SnapiIntType())) + case "delimiter" => Right(ExpParam(SnapiStringType())) + case "escape" => Right(ExpParam(SnapiStringType(Set(SnapiIsNullableTypeProperty())))) + case "quote" => Right(ExpParam(SnapiStringType(Set(SnapiIsNullableTypeProperty())))) + case "nulls" => Right(ExpParam(SnapiListType(SnapiStringType()))) + case "nans" => Right(ExpParam(SnapiListType(SnapiStringType()))) + case "timeFormat" => Right(ExpParam(SnapiStringType())) + case "dateFormat" => Right(ExpParam(SnapiStringType())) + case "timestampFormat" => Right(ExpParam(SnapiStringType())) } } @@ -546,7 +546,7 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some( @@ -566,16 +566,16 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "sampleSize" => Right(ValueParam(Rql2IntType())) - case "encoding" => Right(ValueParam(Rql2StringType())) - case "hasHeader" => Right(ValueParam(Rql2BoolType())) - case "delimiters" => Right(ValueParam(Rql2ListType(Rql2StringType()))) - case "nulls" => Right(ValueParam(Rql2ListType(Rql2StringType()))) - case "nans" => Right(ValueParam(Rql2ListType(Rql2StringType()))) - case "skip" => Right(ValueParam(Rql2IntType())) - case "escape" => Right(ValueParam(Rql2StringType())) - case "quotes" => Right(ValueParam(Rql2ListType(Rql2StringType(Set(Rql2IsNullableTypeProperty()))))) - case "preferNulls" => Right(ValueParam(Rql2BoolType())) + case "sampleSize" => Right(ValueParam(SnapiIntType())) + case "encoding" => Right(ValueParam(SnapiStringType())) + case "hasHeader" => Right(ValueParam(SnapiBoolType())) + case "delimiters" => Right(ValueParam(SnapiListType(SnapiStringType()))) + case "nulls" => Right(ValueParam(SnapiListType(SnapiStringType()))) + case "nans" => Right(ValueParam(SnapiListType(SnapiStringType()))) + case "skip" => Right(ValueParam(SnapiIntType())) + case "escape" => Right(ValueParam(SnapiStringType())) + case "quotes" => Right(ValueParam(SnapiListType(SnapiStringType(Set(SnapiIsNullableTypeProperty()))))) + case "preferNulls" => Right(ValueParam(SnapiBoolType())) } } @@ -587,7 +587,7 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe val codeData = getStringValue(mandatoryArgs.head) for ( inferrerProperties <- getCsvInferrerProperties( - Seq(ValueArg(Rql2LocationValue(new InMemoryByteStreamLocation(codeData), ""), Rql2LocationType())), + Seq(ValueArg(SnapiLocationValue(new InMemoryByteStreamLocation(codeData), ""), SnapiLocationType())), optionalArgs ); inputFormatDescriptor <- programContext.infer(inferrerProperties); @@ -615,10 +615,10 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe val makeNullables = sampled && preferNulls val makeTryables = sampled - val convertedAtts = atts.map(x => Rql2AttrType(x.idn, inferTypeToRql2Type(x.tipe, makeNullables, makeTryables))) + val convertedAtts = atts.map(x => SnapiAttrType(x.idn, inferTypeToSnapiType(x.tipe, makeNullables, makeTryables))) // Here we are making the record not nullable and not tryable. - Rql2IterableType(Rql2RecordType(convertedAtts)) + SnapiIterableType(SnapiRecordType(convertedAtts)) } } @@ -634,7 +634,7 @@ class CsvInferAndParseEntry extends SugarEntryExtension with CsvEntryExtensionHe val r = for ( inferrerProperties <- getCsvInferrerProperties( - Seq(ValueArg(Rql2LocationValue(new InMemoryByteStreamLocation(codeData), ""), Rql2LocationType())), + Seq(ValueArg(SnapiLocationValue(new InMemoryByteStreamLocation(codeData), ""), SnapiLocationType())), optionalArgs ); inputFormatDescriptor <- programContext.infer(inferrerProperties) @@ -781,7 +781,7 @@ class CsvParseEntry extends EntryExtension with CsvEntryExtensionHelper { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2StringType())) + case 0 => Right(ExpParam(SnapiStringType())) case 1 => // We check valid types in return type instead, since it's easier to express there, as we do not // have a specific constraint. @@ -805,15 +805,15 @@ class CsvParseEntry extends EntryExtension with CsvEntryExtensionHelper { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "skip" => Right(ExpParam(Rql2IntType())) - case "delimiter" => Right(ExpParam(Rql2StringType())) - case "escape" => Right(ExpParam(Rql2StringType(Set(Rql2IsNullableTypeProperty())))) - case "quote" => Right(ExpParam(Rql2StringType(Set(Rql2IsNullableTypeProperty())))) - case "nulls" => Right(ExpParam(Rql2ListType(Rql2StringType()))) - case "nans" => Right(ExpParam(Rql2ListType(Rql2StringType()))) - case "timeFormat" => Right(ExpParam(Rql2StringType())) - case "dateFormat" => Right(ExpParam(Rql2StringType())) - case "timestampFormat" => Right(ExpParam(Rql2StringType())) + case "skip" => Right(ExpParam(SnapiIntType())) + case "delimiter" => Right(ExpParam(SnapiStringType())) + case "escape" => Right(ExpParam(SnapiStringType(Set(SnapiIsNullableTypeProperty())))) + case "quote" => Right(ExpParam(SnapiStringType(Set(SnapiIsNullableTypeProperty())))) + case "nulls" => Right(ExpParam(SnapiListType(SnapiStringType()))) + case "nans" => Right(ExpParam(SnapiListType(SnapiStringType()))) + case "timeFormat" => Right(ExpParam(SnapiStringType())) + case "dateFormat" => Right(ExpParam(SnapiStringType())) + case "timestampFormat" => Right(ExpParam(SnapiStringType())) } } @@ -857,16 +857,16 @@ trait CsvEntryExtensionHelper extends EntryExtensionHelper { } } - protected def validateCsvType(t: Type): Either[Seq[UnsupportedType], Rql2IterableType] = { + protected def validateCsvType(t: Type): Either[Seq[UnsupportedType], SnapiIterableType] = { t match { - case Rql2IterableType(Rql2RecordType(atts, _), _) => + case SnapiIterableType(SnapiRecordType(atts, _), _) => val validated = atts.map { x => x.tipe match { - case _: Rql2StringType => Right(x) - case _: Rql2NumberType => Right(x) - case _: Rql2BoolType => Right(x) - case _: Rql2TemporalType => Right(x) - case _: Rql2UndefinedType => Right(x) + case _: SnapiStringType => Right(x) + case _: SnapiNumberType => Right(x) + case _: SnapiBoolType => Right(x) + case _: SnapiTemporalType => Right(x) + case _: SnapiUndefinedType => Right(x) case _ => Left(Seq(UnsupportedType(x.tipe, x.tipe, None))) } } @@ -874,7 +874,7 @@ trait CsvEntryExtensionHelper extends EntryExtensionHelper { val errors = validated.collect { case Left(error) => error } if (errors.nonEmpty) Left(errors.flatten) - else Right(Rql2IterableType(Rql2RecordType(atts))) + else Right(SnapiIterableType(SnapiRecordType(atts))) case _ => Left(Seq(UnsupportedType(t, t, None))) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DatePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DatePackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DatePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DatePackage.scala index 5fb2dd1ef..002699a1f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DatePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DatePackage.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} -import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, ShortEntryExtension} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.snapi.source._ import java.time.LocalDate @@ -60,8 +60,8 @@ class DateBuildEntry extends ShortEntryExtension( "Date", "Build", - Vector(Rql2IntType(), Rql2IntType(), Rql2IntType()), - Rql2DateType(Set(Rql2IsTryableTypeProperty())), + Vector(SnapiIntType(), SnapiIntType(), SnapiIntType()), + SnapiDateType(Set(SnapiIsTryableTypeProperty())), docs = EntryDoc( "Builds a date value.", examples = List(ExampleDoc("""Date.Build(2022, 1, 15)""", result = Some("15th January 2022"))), @@ -78,8 +78,8 @@ class DateFromEpochDayEntry extends ShortEntryExtension( "Date", "FromEpochDay", - Vector(Rql2LongType()), - Rql2DateType(), + Vector(SnapiLongType()), + SnapiDateType(), EntryDoc( summary = "Builds a date by adding the number of days from 1970-01-01 (Unix epoch).", examples = List( @@ -98,8 +98,8 @@ class DateFromTimestampEntry extends ShortEntryExtension( "Date", "FromTimestamp", - Vector(Rql2TimestampType()), - Rql2DateType(), + Vector(SnapiTimestampType()), + SnapiDateType(), EntryDoc( summary = "Builds a date from a timestamp.", examples = List( @@ -116,8 +116,8 @@ class DateParseEntry extends ShortEntryExtension( "Date", "Parse", - Vector(Rql2StringType(), Rql2StringType()), - Rql2DateType(Set(Rql2IsTryableTypeProperty())), + Vector(SnapiStringType(), SnapiStringType()), + SnapiDateType(Set(SnapiIsTryableTypeProperty())), EntryDoc( summary = "Parses a date from a string.", description = Some( @@ -140,7 +140,7 @@ class DateNowEntry "Date", "Now", Vector(), - Rql2DateType(), + SnapiDateType(), EntryDoc( summary = "Returns the current date.", ret = Some(ReturnDoc("The current date.", retType = Some(TypeDoc(List("date"))))) @@ -151,8 +151,8 @@ class DateYearEntry extends ShortEntryExtension( "Date", "Year", - Vector(Rql2DateType()), - Rql2IntType(), + Vector(SnapiDateType()), + SnapiIntType(), EntryDoc( summary = "Returns the year component of the date.", examples = List(ExampleDoc("""Date.Year(Date.Build(1975, 6, 23))""", result = Some("1975"))), @@ -167,8 +167,8 @@ class DateMonthEntry extends ShortEntryExtension( "Date", "Month", - Vector(Rql2DateType()), - Rql2IntType(), + Vector(SnapiDateType()), + SnapiIntType(), EntryDoc( summary = "Returns the month component of the date.", examples = List(ExampleDoc("""Date.Month(Date.Build(1975, 6, 23))""", result = Some("6"))), @@ -183,8 +183,8 @@ class DateDayEntry extends ShortEntryExtension( "Date", "Day", - Vector(Rql2DateType()), - Rql2IntType(), + Vector(SnapiDateType()), + SnapiIntType(), EntryDoc( summary = "Returns the day component of the date.", examples = List(ExampleDoc("""Date.Day(Date.Build(1975, 6, 23))""", result = Some("23"))), @@ -199,8 +199,8 @@ class DateSubtractEntry extends ShortEntryExtension( "Date", "Subtract", - Vector(Rql2DateType(), Rql2DateType()), - Rql2IntervalType(), + Vector(SnapiDateType(), SnapiDateType()), + SnapiIntervalType(), EntryDoc( summary = "Subtracts two dates.", examples = List( @@ -225,8 +225,8 @@ class DateAddIntervalEntry extends ShortEntryExtension( "Date", "AddInterval", - mandatoryParams = Vector(Rql2DateType(), Rql2IntervalType()), - returnType = Rql2TimestampType(), + mandatoryParams = Vector(SnapiDateType(), SnapiIntervalType()), + returnType = SnapiTimestampType(), EntryDoc( summary = "Adds an interval to a date.", examples = List( @@ -256,8 +256,8 @@ class DateSubtractIntervalEntry extends ShortEntryExtension( "Date", "SubtractInterval", - mandatoryParams = Vector(Rql2DateType(), Rql2IntervalType()), - returnType = Rql2TimestampType(), + mandatoryParams = Vector(SnapiDateType(), SnapiIntervalType()), + returnType = SnapiTimestampType(), EntryDoc( summary = "Subtracts an interval to a date.", examples = List( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DecimalPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DecimalPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DecimalPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DecimalPackage.scala index 8406fc5fa..396056f6b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DecimalPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DecimalPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -23,7 +23,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ Param, ShortEntryExtension } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ object DecimalPackageBuilder { @@ -83,11 +83,11 @@ class DecimalFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2DecimalType(props)) + Right(SnapiDecimalType(props)) } } @@ -96,8 +96,8 @@ class DecimalRoundEntry extends ShortEntryExtension( "Decimal", "Round", - Vector(Rql2DecimalType(), Rql2IntType()), - Rql2DecimalType(), + Vector(SnapiDecimalType(), SnapiIntType()), + SnapiDecimalType(), EntryDoc( summary = "Rounds a decimal to the specified number of decimal places.", examples = List( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DoublePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DoublePackage.scala similarity index 81% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DoublePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DoublePackage.scala index bcb780240..3e7af1df9 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/DoublePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/DoublePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object DoublePackageBuilder { @@ -73,11 +73,11 @@ class DoubleFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2DoubleType(props)) + Right(SnapiDoubleType(props)) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/EnvironmentPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/EnvironmentPackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/EnvironmentPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/EnvironmentPackage.scala index 5bf99d93b..a7cf779a8 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/EnvironmentPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/EnvironmentPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -24,7 +24,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ShortEntryExtension, TypeParam } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ object EnvironmentPackageBuilder { @@ -51,8 +51,8 @@ class EnvironmentSecretEntry extends ShortEntryExtension( "Environment", "Secret", - Vector(Rql2StringType()), - Rql2StringType(Set(Rql2IsTryableTypeProperty())), + Vector(SnapiStringType()), + SnapiStringType(Set(SnapiIsTryableTypeProperty())), EntryDoc( summary = "Returns the value of a secret registered in the credentials service.", examples = List(ExampleDoc("""Environment.Secret("my-secret-credential")""", result = Some("secret value"))), @@ -68,7 +68,7 @@ class EnvironmentScopesEntry "Environment", "Scopes", Vector(), - Rql2ListType(Rql2StringType()), + SnapiListType(SnapiStringType()), EntryDoc( summary = "Returns the scopes for the current user.", examples = List(ExampleDoc("""Environment.Scopes()""", result = Some("""["sales", "marketing"]"""))), diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ErrorPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ErrorPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ErrorPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ErrorPackage.scala index e9252ad69..df8084874 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ErrorPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ErrorPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -24,7 +24,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ TypeArg, TypeParam } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ object ErrorPackageBuilder { @@ -66,7 +66,7 @@ class ErrorBuildEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(Rql2StringType())) + case 0 => Right(ExpParam(SnapiStringType())) } override def returnType( @@ -74,7 +74,7 @@ class ErrorBuildEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2UndefinedType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiUndefinedType(Set(SnapiIsTryableTypeProperty()))) } } @@ -90,8 +90,8 @@ class ErrorBuildWithTypeEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(TypeParam(DoesNotHaveTypeProperties(Set(Rql2IsTryableTypeProperty())))) - case 1 => Right(ExpParam(Rql2StringType())) + case 0 => Right(TypeParam(DoesNotHaveTypeProperties(Set(SnapiIsTryableTypeProperty())))) + case 1 => Right(ExpParam(SnapiStringType())) } override def returnType( @@ -100,7 +100,7 @@ class ErrorBuildWithTypeEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val TypeArg(t) = mandatoryArgs(0) - Right(addProp(t, Rql2IsTryableTypeProperty())) + Right(addProp(t, SnapiIsTryableTypeProperty())) } } @@ -124,7 +124,7 @@ class ErrorGetEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType()) + Right(SnapiStringType()) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FloatPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/FloatPackage.scala similarity index 81% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FloatPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/FloatPackage.scala index 7cda0ca14..2afea290f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FloatPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/FloatPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object FloatPackageBuilder { @@ -77,11 +77,11 @@ class FloatFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2FloatType(props)) + Right(SnapiFloatType(props)) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FunctionPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/FunctionPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FunctionPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/FunctionPackage.scala index aa57c3422..449fe815c 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/FunctionPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/FunctionPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source.FunType -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source.FunType +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class FunctionPackage extends PackageExtension { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/HttpPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/HttpPackage.scala similarity index 78% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/HttpPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/HttpPackage.scala index 7cfce7f6b..3907c701b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/HttpPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/HttpPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -23,7 +23,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ Param, ShortEntryExtension } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import scala.collection.immutable.ListMap @@ -41,24 +41,24 @@ class HttpReadEntry extends ShortEntryExtension( "Http", "Read", - Vector(Rql2LocationType()), - Rql2RecordType( + Vector(SnapiLocationType()), + SnapiRecordType( Vector( - Rql2AttrType("status", Rql2IntType()), - Rql2AttrType("data", Rql2BinaryType()), - Rql2AttrType( + SnapiAttrType("status", SnapiIntType()), + SnapiAttrType("data", SnapiBinaryType()), + SnapiAttrType( "headers", - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType()), - Rql2AttrType("_2", Rql2StringType()) + SnapiAttrType("_1", SnapiStringType()), + SnapiAttrType("_2", SnapiStringType()) ) ) ) ) ), - Set(Rql2IsTryableTypeProperty()) + Set(SnapiIsTryableTypeProperty()) ), docs = EntryDoc( summary = "Makes an HTTP call", @@ -90,8 +90,8 @@ class HttpReadEntry ) ), optionalParamsMap = ListMap( - "expectedStatus" -> (Rql2ListType(Rql2IntType(), Set(Rql2IsNullableTypeProperty())), - NullablePackageBuilder.Empty(Rql2ListType(Rql2IntType()))) + "expectedStatus" -> (SnapiListType(SnapiIntType(), Set(SnapiIsNullableTypeProperty())), + NullablePackageBuilder.Empty(SnapiListType(SnapiIntType()))) ) ) @@ -171,7 +171,7 @@ abstract class HttpCallEntry(method: String) extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some( @@ -189,18 +189,18 @@ abstract class HttpCallEntry(method: String) extends EntryExtension { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "bodyString" => Right(ExpParam(Rql2StringType())) - case "bodyBinary" => Right(ExpParam(Rql2BinaryType())) - case "authCredentialName" => Right(ExpParam(Rql2StringType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "bodyString" => Right(ExpParam(SnapiStringType())) + case "bodyBinary" => Right(ExpParam(SnapiBinaryType())) + case "authCredentialName" => Right(ExpParam(SnapiStringType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) case "args" => Right( ExpParam( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("_2", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("_1", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("_2", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) @@ -208,17 +208,17 @@ abstract class HttpCallEntry(method: String) extends EntryExtension { ) case "headers" => Right( ExpParam( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("_2", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("_1", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("_2", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) ) ) - case "expectedStatus" => Right(ExpParam(Rql2ListType(Rql2IntType()))) + case "expectedStatus" => Right(ExpParam(SnapiListType(SnapiIntType()))) } } @@ -227,7 +227,7 @@ abstract class HttpCallEntry(method: String) extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2LocationType()) + Right(SnapiLocationType()) } } @@ -236,8 +236,8 @@ class HttpUrlEncodeEntry extends ShortEntryExtension( "Http", "UrlEncode", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( "Encodes a string as a URL.", params = List(ParamDoc("value", TypeDoc(List("string")), "The string to encode.")), @@ -249,8 +249,8 @@ class HttpUrlDecodeEntry extends ShortEntryExtension( "Http", "UrlDecode", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( "Decodes a URL-encoded string.", params = List(ParamDoc("value", TypeDoc(List("string")), "The string to decode.")), diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/IntPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/IntPackage.scala index 11b878e06..0062cffdb 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/IntPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object IntPackageBuilder { @@ -77,11 +77,11 @@ class IntFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2IntType(props)) + Right(SnapiIntType(props)) } override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { @@ -117,12 +117,12 @@ class IntRangeEntry extends EntryExtension { override def optionalParams: Option[Set[String]] = Some(Set("step")) override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { assert(idn == "step") - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) } override def returnType( @@ -130,7 +130,7 @@ class IntRangeEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IterableType(Rql2IntType())) + Right(SnapiIterableType(SnapiIntType())) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntervalPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/IntervalPackage.scala similarity index 90% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntervalPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/IntervalPackage.scala index f192f8edd..f132fe33f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/IntervalPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/IntervalPackage.scala @@ -10,12 +10,12 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -23,7 +23,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ Param, ShortEntryExtension } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ object IntervalPackageBuilder { @@ -150,7 +150,7 @@ class BuildIntervalEntry extends EntryExtension { ) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) } override def returnType( @@ -158,7 +158,7 @@ class BuildIntervalEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IntervalType()) + Right(SnapiIntervalType()) } } @@ -167,8 +167,8 @@ class IntervalToMillisEntryExtension extends ShortEntryExtension( "Interval", "ToMillis", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2LongType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiLongType(), EntryDoc( summary = "Converts a interval to the corresponding number of milliseconds", examples = List( @@ -194,8 +194,8 @@ class IntervalFromMillisEntryExtension extends ShortEntryExtension( "Interval", "FromMillis", - mandatoryParams = Vector(Rql2LongType()), - returnType = Rql2IntervalType(), + mandatoryParams = Vector(SnapiLongType()), + returnType = SnapiIntervalType(), EntryDoc( summary = "Converts a number of milliseconds to the corresponding interval", examples = List( @@ -217,8 +217,8 @@ class IntervalParseEntryExtension extends ShortEntryExtension( "Interval", "Parse", - mandatoryParams = Vector(Rql2StringType()), - returnType = Rql2IntervalType(Set(Rql2IsTryableTypeProperty())), + mandatoryParams = Vector(SnapiStringType()), + returnType = SnapiIntervalType(Set(SnapiIsTryableTypeProperty())), EntryDoc( """"Parses an interval from a string.""", info = Some( @@ -254,8 +254,8 @@ class IntervalYearsEntry extends ShortEntryExtension( "Interval", "Years", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the years part of an interval.""", examples = List( @@ -277,8 +277,8 @@ class IntervalMonthsEntry extends ShortEntryExtension( "Interval", "Months", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the months part of an interval.""", examples = List( @@ -300,8 +300,8 @@ class IntervalWeeksEntry extends ShortEntryExtension( "Interval", "Weeks", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the weeks part of an interval.""", examples = List( @@ -323,8 +323,8 @@ class IntervalDaysEntry extends ShortEntryExtension( "Interval", "Days", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the days part of an interval.""", examples = List( @@ -346,8 +346,8 @@ class IntervalHoursEntry extends ShortEntryExtension( "Interval", "Hours", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the hours part of an interval.""", examples = List( @@ -369,8 +369,8 @@ class IntervalMinutesEntry extends ShortEntryExtension( "Interval", "Minutes", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the minutes part of an interval.""", examples = List( @@ -392,8 +392,8 @@ class IntervalSecondsEntry extends ShortEntryExtension( "Interval", "Seconds", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the seconds part of an interval.""", examples = List( @@ -415,8 +415,8 @@ class IntervalMillisEntry extends ShortEntryExtension( "Interval", "Millis", - mandatoryParams = Vector(Rql2IntervalType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiIntervalType()), + returnType = SnapiIntType(), EntryDoc( summary = """"Gets the milliseconds part of an interval.""", examples = List( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/JsonPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/JsonPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala index 10692beed..18d0bd2bc 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/JsonPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/JsonPackage.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, EntryExtensionHelper, @@ -47,7 +47,7 @@ object JsonPackage extends JsonPackage { def outputWriteSupport(dataType: Type): Boolean = { everywhere(query[Type] { - case _: FunType | _: PackageType | _: PackageEntryType | _: Rql2LocationType => return false; + case _: FunType | _: PackageType | _: PackageEntryType | _: SnapiLocationType => return false; })(dataType) true } @@ -100,7 +100,7 @@ class InferAndReadJsonEntry extends SugarEntryExtension with JsonEntryExtensionH override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ValueParam(Rql2LocationType())) + Right(ValueParam(SnapiLocationType())) } override def optionalParams: Option[Set[String]] = Some( @@ -113,9 +113,9 @@ class InferAndReadJsonEntry extends SugarEntryExtension with JsonEntryExtensionH override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "sampleSize" => Right(ValueParam(Rql2IntType())) - case "encoding" => Right(ValueParam(Rql2StringType())) - case "preferNulls" => Right(ValueParam(Rql2BoolType())) + case "sampleSize" => Right(ValueParam(SnapiIntType())) + case "encoding" => Right(ValueParam(SnapiStringType())) + case "preferNulls" => Right(ValueParam(SnapiBoolType())) } } @@ -138,11 +138,11 @@ class InferAndReadJsonEntry extends SugarEntryExtension with JsonEntryExtensionH _, JsonFormatDescriptor(inferredType, sampled, _, _, _) ) = descriptor; - rql2Type = inferTypeToRql2Type(inferredType, makeNullable = preferNulls && sampled, makeTryable = sampled); - okType <- validateInferredJsonType(rql2Type, node) + snapiType = inferTypeToSnapiType(inferredType, makeNullable = preferNulls && sampled, makeTryable = sampled); + okType <- validateInferredJsonType(snapiType, node) ) yield okType match { - case Rql2IterableType(rowType, _) => Rql2IterableType(rowType) - case other => addProp(other, Rql2IsTryableTypeProperty()) + case SnapiIterableType(rowType, _) => SnapiIterableType(rowType) + case other => addProp(other, SnapiIsTryableTypeProperty()) } } @@ -248,7 +248,7 @@ class ReadJsonEntry extends EntryExtension with JsonEntryExtensionHelper { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2LocationType())) + case 0 => Right(ExpParam(SnapiLocationType())) case 1 => // We check valid types in return type instead, since it's easier to express there, as we do not // have a specific constraint. @@ -267,10 +267,10 @@ class ReadJsonEntry extends EntryExtension with JsonEntryExtensionHelper { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "encoding" => Right(ExpParam(Rql2StringType())) - case "timeFormat" => Right(ExpParam(Rql2StringType())) - case "dateFormat" => Right(ExpParam(Rql2StringType())) - case "timestampFormat" => Right(ExpParam(Rql2StringType())) + case "encoding" => Right(ExpParam(SnapiStringType())) + case "timeFormat" => Right(ExpParam(SnapiStringType())) + case "dateFormat" => Right(ExpParam(SnapiStringType())) + case "timestampFormat" => Right(ExpParam(SnapiStringType())) } } @@ -282,8 +282,8 @@ class ReadJsonEntry extends EntryExtension with JsonEntryExtensionHelper { )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { val t = mandatoryArgs(1).t validateUserJsonType(t).right.map { - case Rql2IterableType(rowType, _) => Rql2IterableType(rowType) - case t => addProp(t, Rql2IsTryableTypeProperty()) + case SnapiIterableType(rowType, _) => SnapiIterableType(rowType) + case t => addProp(t, SnapiIsTryableTypeProperty()) } } @@ -335,7 +335,7 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some( @@ -348,9 +348,9 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "sampleSize" => Right(ValueParam(Rql2IntType())) - case "encoding" => Right(ValueParam(Rql2StringType())) - case "preferNulls" => Right(ValueParam(Rql2BoolType())) + case "sampleSize" => Right(ValueParam(SnapiIntType())) + case "encoding" => Right(ValueParam(SnapiStringType())) + case "preferNulls" => Right(ValueParam(SnapiBoolType())) } } @@ -363,7 +363,7 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension val codeData = getStringValue(mandatoryArgs.head) val preferNulls = optionalArgs.collectFirst { case a if a._1 == "preferNulls" => a._2 }.forall(getBoolValue) val inferenceDiagnostic: Either[Seq[ErrorCompilerMessage], InferrerOutput] = getJsonInferrerProperties( - Seq(ValueArg(Rql2LocationValue(new InMemoryByteStreamLocation(codeData), ""), Rql2LocationType())), + Seq(ValueArg(SnapiLocationValue(new InMemoryByteStreamLocation(codeData), ""), SnapiLocationType())), optionalArgs ) .flatMap(programContext.infer) @@ -376,11 +376,11 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension _, JsonFormatDescriptor(inferredType, sampled, _, _, _) ) = descriptor; - rql2Type = inferTypeToRql2Type(inferredType, makeNullable = preferNulls && sampled, makeTryable = sampled); - okType <- validateInferredJsonType(rql2Type, node) + snapiType = inferTypeToSnapiType(inferredType, makeNullable = preferNulls && sampled, makeTryable = sampled); + okType <- validateInferredJsonType(snapiType, node) ) yield okType match { - case Rql2IterableType(rowType, _) => Rql2IterableType(rowType) - case other => addProp(other, Rql2IsTryableTypeProperty()) + case SnapiIterableType(rowType, _) => SnapiIterableType(rowType) + case other => addProp(other, SnapiIsTryableTypeProperty()) } } @@ -395,7 +395,7 @@ class InferAndParseJsonEntry extends SugarEntryExtension with JsonEntryExtension val inputFormatDescriptor = for ( inferrerProperties <- getJsonInferrerProperties( - Seq(ValueArg(Rql2LocationValue(new InMemoryByteStreamLocation(codeData), ""), Rql2LocationType())), + Seq(ValueArg(SnapiLocationValue(new InMemoryByteStreamLocation(codeData), ""), SnapiLocationType())), optionalArgs ); inputFormatDescriptor <- programContext.infer(inferrerProperties) @@ -493,7 +493,7 @@ class ParseJsonEntry extends EntryExtension with JsonEntryExtensionHelper { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2StringType())) + case 0 => Right(ExpParam(SnapiStringType())) case 1 => // We check valid types in return type instead, since it's easier to express there, as we do not // have a specific constraint. @@ -511,9 +511,9 @@ class ParseJsonEntry extends EntryExtension with JsonEntryExtensionHelper { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "timeFormat" => Right(ExpParam(Rql2StringType())) - case "dateFormat" => Right(ExpParam(Rql2StringType())) - case "timestampFormat" => Right(ExpParam(Rql2StringType())) + case "timeFormat" => Right(ExpParam(SnapiStringType())) + case "dateFormat" => Right(ExpParam(SnapiStringType())) + case "timestampFormat" => Right(ExpParam(SnapiStringType())) } } @@ -525,7 +525,7 @@ class ParseJsonEntry extends EntryExtension with JsonEntryExtensionHelper { )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { val t = mandatoryArgs(1).t validateUserJsonType(t).right.map { - case Rql2IterableType(rowType, _) => Rql2IterableType(rowType) + case SnapiIterableType(rowType, _) => SnapiIterableType(rowType) case other => other } } @@ -563,7 +563,7 @@ class PrintJsonEntry extends EntryExtension with JsonEntryExtensionHelper { )(implicit programContext: ProgramContext): Either[String, Type] = { // Here we validate the type of the argument, and always return a string val data = mandatoryArgs.head - if (JsonPackage.outputWriteSupport(data.t)) Right(Rql2StringType()) + if (JsonPackage.outputWriteSupport(data.t)) Right(SnapiStringType()) else Left(s"unsupported type ${SourcePrettyPrinter.format(data.t)}") } @@ -600,8 +600,8 @@ trait JsonEntryExtensionHelper extends EntryExtensionHelper { ) private def validateJsonType(t: Type): Either[Seq[(Type, Option[String])], Type] = t match { - case _: Rql2LocationType => Left(Seq((t, None))) - case Rql2RecordType(atts, props) => + case _: SnapiLocationType => Left(Seq((t, None))) + case SnapiRecordType(atts, props) => val duplicates = atts.groupBy(_.idn).mapValues(_.size).collect { case (field, n) if n > 1 => field } if (duplicates.nonEmpty) { val explanation = @@ -616,15 +616,15 @@ trait JsonEntryExtensionHelper extends EntryExtensionHelper { if (errors.nonEmpty) Left(errors.flatten) else { val attTypes = validation.collect { case Right(t) => t } - val validAttributes = atts.zip(attTypes).map { case (a, validType) => Rql2AttrType(a.idn, validType) } - Right(Rql2RecordType(validAttributes, props)) + val validAttributes = atts.zip(attTypes).map { case (a, validType) => SnapiAttrType(a.idn, validType) } + Right(SnapiRecordType(validAttributes, props)) } } - case Rql2IterableType(innerType, props) => - validateJsonType(innerType).right.map(validType => Rql2IterableType(validType, props)) - case Rql2ListType(innerType, props) => - validateJsonType(innerType).right.map(validType => Rql2ListType(validType, props)) - case Rql2OrType(options, props) => + case SnapiIterableType(innerType, props) => + validateJsonType(innerType).right.map(validType => SnapiIterableType(validType, props)) + case SnapiListType(innerType, props) => + validateJsonType(innerType).right.map(validType => SnapiListType(validType, props)) + case SnapiOrType(options, props) => // inner types may have 'tryable' or 'nullable' flags: // * tryable is removed because a tryable-whatever option would always successfully parse // as a failed whatever, and other parsers would never be tested. @@ -638,12 +638,12 @@ trait JsonEntryExtensionHelper extends EntryExtensionHelper { else { val validOptions = validation.collect { case Right(t) => t } val nullable = - options.exists { case t: Rql2TypeWithProperties => t.props.contains(Rql2IsNullableTypeProperty()) } - val finalProps = if (nullable) props + Rql2IsNullableTypeProperty() else props - Right(Rql2OrType(validOptions, finalProps)) + options.exists { case t: SnapiTypeWithProperties => t.props.contains(SnapiIsNullableTypeProperty()) } + val finalProps = if (nullable) props + SnapiIsNullableTypeProperty() else props + Right(SnapiOrType(validOptions, finalProps)) } - case t: Rql2PrimitiveType => Right(t) - case t: Rql2UndefinedType => Right(t) + case t: SnapiPrimitiveType => Right(t) + case t: SnapiUndefinedType => Right(t) case t => Left(Seq((t, None))) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/KryoPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/KryoPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/KryoPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/KryoPackage.scala index 4839f150c..f832891bc 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/KryoPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/KryoPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions._ -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions._ +import com.rawlabs.snapi.frontend.snapi.source._ class KryoPackage extends PackageExtension { @@ -43,7 +43,7 @@ class KryoEncodeEntry extends EntryExtension { mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] - )(implicit programContext: ProgramContext): Either[String, Type] = Right(Rql2BinaryType()) + )(implicit programContext: ProgramContext): Either[String, Type] = Right(SnapiBinaryType()) } @@ -58,7 +58,7 @@ class KryoDecodeEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - if (idx == 0) Right(ExpParam(Rql2BinaryType())) + if (idx == 0) Right(ExpParam(SnapiBinaryType())) else Right(TypeParam(AnythingType())) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LibraryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LibraryPackage.scala similarity index 96% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LibraryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LibraryPackage.scala index d25d9786a..adc28d2b2 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LibraryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LibraryPackage.scala @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin /* * Copyright 2023 RAW Labs S.A. @@ -24,7 +24,7 @@ package com.rawlabs.snapi.frontend.rql2.extensions.builtin * licenses/APL.txt. */ -//package com.rawlabs.snapi.frontend.rql2.builtin +//package com.rawlabs.snapi.frontend.snapi.builtin // //import com.typesafe.scalalogging.StrictLogging //import raw.api.RawException @@ -33,10 +33,10 @@ package com.rawlabs.snapi.frontend.rql2.extensions.builtin //import com.rawlabs.snapi.frontend.base.source.Type //import com.rawlabs.snapi.frontend.base.{ExpDecl, ExpDeclParam} //import com.rawlabs.snapi.frontend.common.CommonCompilerProvider -//import com.rawlabs.snapi.frontend.rql2.source.{Exp, VoidType} +//import com.rawlabs.snapi.frontend.snapi.source.{Exp, VoidType} //import raw.runtime.JvmEntrypoint -//import com.rawlabs.snapi.frontend.rql2._ -//import com.rawlabs.snapi.frontend.rql2.source._ +//import com.rawlabs.snapi.frontend.snapi._ +//import com.rawlabs.snapi.frontend.snapi.source._ //import com.rawlabs.utils.sources.LocationDescription //import com.rawlabs.utils.sources.bytestream.ByteStreamLocationProvider // @@ -90,7 +90,7 @@ package com.rawlabs.snapi.frontend.rql2.extensions.builtin // // FIXME (msb): This code does NOT handle cycles!!! // // val location = getStringValue(mandatoryArgs(0)) -// val compiler = CommonCompilerProvider.apply("rql2")(programContext.compilerContext) +// val compiler = CommonCompilerProvider.apply("snapi")(programContext.compilerContext) // findPackage(location) match { // case Right(source) => compiler.buildInputTree(source)(programContext) match { // case Right(tree) => compiler.compile(tree.root)(programContext) match { @@ -132,7 +132,7 @@ package com.rawlabs.snapi.frontend.rql2.extensions.builtin // val code = new String(is.readAllBytes(), StandardCharsets.UTF_8) // Right(code) // } catch { -// case NonFatal(_) => Left("could not read remote package; is it RQL code?") +// case NonFatal(_) => Left("could not read remote package; is it Snapi code?") // } finally { // is.close() // } @@ -250,7 +250,7 @@ package com.rawlabs.snapi.frontend.rql2.extensions.builtin // // override def toL0(t: Type, args: Seq[L0Arg]): Exp = { // val argNodes = args.map(arg => CallPackageArgNode(arg.e, arg.t, arg.idn)) -// L0.source.CallPackage(entrypointName, entryName, argNodes.to, rql2ToCommonType(t)) +// L0.source.CallPackage(entrypointName, entryName, argNodes.to, snapiToCommonType(t)) // } // //} @@ -308,7 +308,7 @@ package com.rawlabs.snapi.frontend.rql2.extensions.builtin // // override def toL0(t: Type, args: Seq[L0Arg]): Exp = { // val argNodes = args.map(arg => CallPackageArgNode(arg.e, arg.t, arg.idn)) -// L0.source.CallPackage(entrypointName, entryName, argNodes.to, rql2ToCommonType(t)) +// L0.source.CallPackage(entrypointName, entryName, argNodes.to, snapiToCommonType(t)) // } // //} diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ListPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ListPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ListPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ListPackage.scala index 26492e5fe..549383ccf 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ListPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ListPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -30,13 +30,13 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.errors.{ +import com.rawlabs.snapi.frontend.snapi.errors.{ InvalidOrderSpec, ItemsNotComparable, KeyNotComparable, OrderSpecMustFollowOrderingFunction } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ object ListPackageBuilder { @@ -132,7 +132,7 @@ class EmptyListEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val TypeArg(itemType) = mandatoryArgs.head - Right(Rql2ListType(itemType)) + Right(SnapiListType(itemType)) } } @@ -173,11 +173,11 @@ class BuildListEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { if (varArgs.isEmpty) { - Right(Rql2ListType(Rql2UndefinedType())) + Right(SnapiListType(SnapiUndefinedType())) } else { val typesMerger = new TypesMerger val t = typesMerger.mergeType(varArgs.map(_.t): _*).get - Right(Rql2ListType(t)) + Right(SnapiListType(t)) } } @@ -209,8 +209,8 @@ class GetListEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) - case 1 => Right(ExpParam(Rql2IntType())) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) + case 1 => Right(ExpParam(SnapiIntType())) } } @@ -219,8 +219,8 @@ class GetListEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2ListType(itemType, _)) = mandatoryArgs.head - Right(addProp(itemType, Rql2IsTryableTypeProperty())) + val ExpArg(_, SnapiListType(itemType, _)) = mandatoryArgs.head + Right(addProp(itemType, SnapiIsTryableTypeProperty())) } } @@ -235,7 +235,7 @@ trait ListToCollectionHint { this: EntryExtension => ): Option[String] = { idx match { case 0 => actual match { - case _: Rql2IterableType => Some(s"did you mean Collection.$entryName?") + case _: SnapiIterableType => Some(s"did you mean Collection.$entryName?") case _ => None } case _ => None @@ -277,9 +277,9 @@ class FilterListEntry extends EntryExtension with PredicateNormalization with Li override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -327,9 +327,9 @@ class TransformListEntry extends EntryExtension with ListToCollectionHint { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) } @@ -341,7 +341,7 @@ class TransformListEntry extends EntryExtension with ListToCollectionHint { )(implicit programContext: ProgramContext): Either[String, Type] = { val FunType(_, _, outType, props) = mandatoryArgs(1).t assert(props.isEmpty, "Should have been handled as per arg 1 definition") - Right(Rql2ListType(outType)) + Right(SnapiListType(outType)) } } @@ -366,8 +366,8 @@ class TakeListEntry extends EntryExtension with ListToCollectionHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) - case 1 => Right(ExpParam(Rql2LongType())) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) + case 1 => Right(ExpParam(SnapiLongType())) } } @@ -386,7 +386,7 @@ abstract class AggregationListEntry(aggregation: Aggregation) extends Aggregatio override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2ListType(aggregation.innerTypeConstraint))) + Right(ExpParam(SnapiListType(aggregation.innerTypeConstraint))) } override def returnType( @@ -394,7 +394,7 @@ abstract class AggregationListEntry(aggregation: Aggregation) extends Aggregatio optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2ListType(innerType, _) = mandatoryArgs.head.t + val SnapiListType(innerType, _) = mandatoryArgs.head.t aggregation.aggregationType(innerType) } @@ -501,9 +501,9 @@ class FindFirstListEntry extends SugarEntryExtension with PredicateNormalization override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -514,8 +514,8 @@ class FindFirstListEntry extends SugarEntryExtension with PredicateNormalization optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2ListType(itemType, _)) = mandatoryArgs.head - Right(addProp(itemType, Rql2IsNullableTypeProperty())) + val ExpArg(_, SnapiListType(itemType, _)) = mandatoryArgs.head + Right(addProp(itemType, SnapiIsNullableTypeProperty())) } override def desugar( @@ -580,9 +580,9 @@ class FindLastListEntry extends SugarEntryExtension with PredicateNormalization override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -593,8 +593,8 @@ class FindLastListEntry extends SugarEntryExtension with PredicateNormalization optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2ListType(itemType, _)) = mandatoryArgs.head - Right(addProp(itemType, Rql2IsNullableTypeProperty())) + val ExpArg(_, SnapiListType(itemType, _)) = mandatoryArgs.head + Right(addProp(itemType, SnapiIsNullableTypeProperty())) } override def desugar( @@ -693,9 +693,9 @@ class ExplodeListEntry extends SugarEntryExtension with RecordMerging with ListT override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right( ExpParam( @@ -703,10 +703,10 @@ class ExplodeListEntry extends SugarEntryExtension with RecordMerging with ListT Vector(innerType), Vector.empty, OneOfType( - Rql2ListType(AnythingType()), - Rql2ListType(AnythingType(), Set(Rql2IsNullableTypeProperty())), - Rql2ListType(AnythingType(), Set(Rql2IsTryableTypeProperty())), - Rql2ListType(AnythingType(), Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) + SnapiListType(AnythingType()), + SnapiListType(AnythingType(), Set(SnapiIsNullableTypeProperty())), + SnapiListType(AnythingType(), Set(SnapiIsTryableTypeProperty())), + SnapiListType(AnythingType(), Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) ) ) ) @@ -719,10 +719,10 @@ class ExplodeListEntry extends SugarEntryExtension with RecordMerging with ListT optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2ListType(leftRowType, props)) = mandatoryArgs.head - val ExpArg(_, FunType(_, _, Rql2ListType(rightRowType, _), _)) = mandatoryArgs(1) - val outRowType = rql2JoinOutputRowType(leftRowType, rightRowType) - Right(Rql2ListType(outRowType, props)) + val ExpArg(_, SnapiListType(leftRowType, props)) = mandatoryArgs.head + val ExpArg(_, FunType(_, _, SnapiListType(rightRowType, _), _)) = mandatoryArgs(1) + val outRowType = snapiJoinOutputRowType(leftRowType, rightRowType) + Right(SnapiListType(outRowType, props)) } override def desugar( @@ -732,7 +732,7 @@ class ExplodeListEntry extends SugarEntryExtension with RecordMerging with ListT optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Exp = { - val Rql2ListType(leftRowType, _) = mandatoryArgs.head.t + val SnapiListType(leftRowType, _) = mandatoryArgs.head.t val left = CollectionPackageBuilder.From(args.head.e) val unnestFunction = { val idn = IdnDef() @@ -761,9 +761,9 @@ class UnnestListEntry extends SugarEntryExtension with ListToCollectionHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right( ExpParam( @@ -771,10 +771,10 @@ class UnnestListEntry extends SugarEntryExtension with ListToCollectionHint { Vector(innerType), Vector.empty, OneOfType( - Rql2ListType(AnythingType()), - Rql2ListType(AnythingType(), Set(Rql2IsNullableTypeProperty())), - Rql2ListType(AnythingType(), Set(Rql2IsTryableTypeProperty())), - Rql2ListType(AnythingType(), Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty())) + SnapiListType(AnythingType()), + SnapiListType(AnythingType(), Set(SnapiIsNullableTypeProperty())), + SnapiListType(AnythingType(), Set(SnapiIsTryableTypeProperty())), + SnapiListType(AnythingType(), Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty())) ) ) ) @@ -787,10 +787,10 @@ class UnnestListEntry extends SugarEntryExtension with ListToCollectionHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2ListType(_, props) = mandatoryArgs.head.t + val SnapiListType(_, props) = mandatoryArgs.head.t assert(props.isEmpty, "Should have been handled as per arg 1 definition") - val FunType(_, _, Rql2ListType(outputRowType, _), _) = mandatoryArgs(1).t - Right(Rql2ListType(outputRowType)) + val FunType(_, _, SnapiListType(outputRowType, _), _) = mandatoryArgs(1).t + Right(SnapiListType(outputRowType)) } override def desugar( @@ -800,7 +800,7 @@ class UnnestListEntry extends SugarEntryExtension with ListToCollectionHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Exp = { - val Rql2ListType(leftRowType, _) = mandatoryArgs.head.t + val SnapiListType(leftRowType, _) = mandatoryArgs.head.t val left = CollectionPackageBuilder.From(args.head.e) val unnestFunction = { val idn = IdnDef() @@ -835,7 +835,7 @@ class FromListEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2IterableType(AnythingType()))) + Right(ExpParam(SnapiIterableType(AnythingType()))) } override def returnType( @@ -843,8 +843,8 @@ class FromListEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2IterableType(itemType, _)) = mandatoryArgs.head - Right(Rql2ListType(itemType, Set(Rql2IsTryableTypeProperty()))) + val ExpArg(_, SnapiIterableType(itemType, _)) = mandatoryArgs.head + Right(SnapiListType(itemType, Set(SnapiIsTryableTypeProperty()))) } } @@ -860,7 +860,7 @@ class UnsafeFromListEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2IterableType(AnythingType()))) + Right(ExpParam(SnapiIterableType(AnythingType()))) } override def returnType( @@ -868,8 +868,8 @@ class UnsafeFromListEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2IterableType(itemType, _)) = mandatoryArgs.head - Right(Rql2ListType(itemType)) + val ExpArg(_, SnapiIterableType(itemType, _)) = mandatoryArgs.head + Right(SnapiListType(itemType)) } } @@ -902,9 +902,9 @@ class GroupListEntry extends EntryExtension with ListToCollectionHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) } @@ -920,11 +920,11 @@ class GroupListEntry extends EntryExtension with ListToCollectionHint { val ExpArg(keyFunction, FunType(_, _, keyType, props)) = mandatoryArgs(1) assert(props.isEmpty, "Should have been handled as per arg 1 definition") if (isComparable(keyType)) Right( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("key", keyType), - Rql2AttrType("group", listType) + SnapiAttrType("key", keyType), + SnapiAttrType("group", listType) ) ) ) @@ -987,11 +987,11 @@ class JoinListEntry override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 | 1 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 | 1 => Right(ExpParam(SnapiListType(AnythingType()))) case 2 => - val ExpArg(_, Rql2ListType(leftRowType, _)) = prevMandatoryArgs.head - val ExpArg(_, Rql2ListType(rightRowType, _)) = prevMandatoryArgs(1) - val outType = rql2JoinOutputRowType(leftRowType, rightRowType) + val ExpArg(_, SnapiListType(leftRowType, _)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(rightRowType, _)) = prevMandatoryArgs(1) + val outType = snapiJoinOutputRowType(leftRowType, rightRowType) Right(ExpParam(OneOfType(flexiblePredicateOn(outType), flexiblePredicateOn(Vector(leftRowType, rightRowType))))) } } @@ -1001,10 +1001,10 @@ class JoinListEntry optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val ExpArg(_, Rql2ListType(leftRowType, _)) = mandatoryArgs.head - val ExpArg(_, Rql2ListType(rightRowType, _)) = mandatoryArgs(1) - val outType = rql2JoinOutputRowType(leftRowType, rightRowType) - Right(Rql2ListType(outType)) + val ExpArg(_, SnapiListType(leftRowType, _)) = mandatoryArgs.head + val ExpArg(_, SnapiListType(rightRowType, _)) = mandatoryArgs(1) + val outType = snapiJoinOutputRowType(leftRowType, rightRowType) + Right(SnapiListType(outType)) } override def desugar( @@ -1063,12 +1063,12 @@ class EquiJoinListEntry extends SugarEntryExtension with RecordMerging with List override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 | 1 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 | 1 => Right(ExpParam(SnapiListType(AnythingType()))) case 2 => - val ExpArg(_, Rql2ListType(innerType, _)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, _)) = prevMandatoryArgs.head Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) case 3 => - val ExpArg(_, Rql2ListType(innerType, _)) = prevMandatoryArgs(1) + val ExpArg(_, SnapiListType(innerType, _)) = prevMandatoryArgs(1) val ExpArg(_, FunType(_, _, kType, _)) = prevMandatoryArgs(2) Right(ExpParam(FunType(Vector(innerType), Vector.empty, MergeableType(kType)))) } @@ -1080,14 +1080,14 @@ class EquiJoinListEntry extends SugarEntryExtension with RecordMerging with List optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val ExpArg(_, Rql2ListType(leftRowType, _)) = mandatoryArgs.head - val ExpArg(_, Rql2ListType(rightRowType, _)) = mandatoryArgs(1) + val ExpArg(_, SnapiListType(leftRowType, _)) = mandatoryArgs.head + val ExpArg(_, SnapiListType(rightRowType, _)) = mandatoryArgs(1) val ExpArg(keyFunction1, FunType(_, _, keyType1, _)) = mandatoryArgs(2) val ExpArg(keyFunction2, FunType(_, _, keyType2, _)) = mandatoryArgs(3) if (isComparable(keyType1)) { if (isComparable(keyType2)) { - val mergedRecordType = rql2JoinOutputRowType(leftRowType, rightRowType) - Right(Rql2ListType(mergedRecordType)) + val mergedRecordType = snapiJoinOutputRowType(leftRowType, rightRowType) + Right(SnapiListType(mergedRecordType)) } else Left(Seq(KeyNotComparable(keyFunction2))) } else Left(Seq(KeyNotComparable(keyFunction1))) } @@ -1133,16 +1133,16 @@ class OrderByListEntry extends SugarEntryExtension with ListToCollectionHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2ListType(AnythingType()))) + Right(ExpParam(SnapiListType(AnythingType()))) } override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = { - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") if (idx % 2 == 0) Right(ExpParam(FunType(Vector(innerType), Vector.empty, AnythingType()))) - else Right(ValueParam(Rql2StringType())) + else Right(ValueParam(SnapiStringType())) } override def returnTypeErrorList( @@ -1151,14 +1151,14 @@ class OrderByListEntry extends SugarEntryExtension with ListToCollectionHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val (orders, keyFunctions) = varArgs.partition(_.t.isInstanceOf[Rql2StringType]) + val (orders, keyFunctions) = varArgs.partition(_.t.isInstanceOf[SnapiStringType]) if (orders.size != keyFunctions.size) return Left(Seq(OrderSpecMustFollowOrderingFunction(node))) val keyErrors = for ( ExpArg(arg, FunType(_, _, keyType, _)) <- keyFunctions if !isComparable(keyType) ) yield KeyNotComparable(arg) val orderErrors = for ( - ValueArg(value @ Rql2StringValue(order), _) <- orders + ValueArg(value @ SnapiStringValue(order), _) <- orders if !Set("ASC", "DESC").contains(order.toUpperCase) ) yield InvalidOrderSpec(node, order) val errors = keyErrors ++ orderErrors @@ -1213,7 +1213,7 @@ class DistinctListEntry extends SugarEntryExtension with ListToCollectionHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val ExpArg(list, Rql2ListType(itemType, _)) = mandatoryArgs.head + val ExpArg(list, SnapiListType(itemType, _)) = mandatoryArgs.head if (isComparable(itemType)) Right(mandatoryArgs.head.t) else Left(Seq(ItemsNotComparable(list))) } @@ -1254,7 +1254,7 @@ class UnionListEntry extends SugarEntryExtension with ListToCollectionHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => val ExpArg(_, t) = prevMandatoryArgs.head Right(ExpParam(MergeableType(t))) @@ -1317,14 +1317,14 @@ class AvgListEntry extends SugarEntryExtension with ListToCollectionHint { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2ListType(AvgAggregation.innerTypeConstraint))) + Right(ExpParam(SnapiListType(AvgAggregation.innerTypeConstraint))) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2DecimalType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))) + Right(SnapiDecimalType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))) } override def desugar( @@ -1380,9 +1380,9 @@ class ExistsListEntry extends EntryExtension with PredicateNormalization with Li override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, props)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, props)) = prevMandatoryArgs.head assert(props.isEmpty, "Should have been handled as per arg 0 definition") Right(ExpParam(flexiblePredicateOn(innerType))) } @@ -1393,7 +1393,7 @@ class ExistsListEntry extends EntryExtension with PredicateNormalization with Li optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2BoolType()) + Right(SnapiBoolType()) } } @@ -1424,9 +1424,9 @@ class ContainsListEntry extends SugarEntryExtension with ListToCollectionHint { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2ListType(AnythingType()))) + case 0 => Right(ExpParam(SnapiListType(AnythingType()))) case 1 => - val ExpArg(_, Rql2ListType(innerType, _)) = prevMandatoryArgs.head + val ExpArg(_, SnapiListType(innerType, _)) = prevMandatoryArgs.head Right(ExpParam(innerType)) } } @@ -1437,8 +1437,8 @@ class ContainsListEntry extends SugarEntryExtension with ListToCollectionHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { - val ExpArg(list, Rql2ListType(itemType, _)) = mandatoryArgs.head - if (isComparable(itemType)) Right(Rql2BoolType()) + val ExpArg(list, SnapiListType(itemType, _)) = mandatoryArgs.head + if (isComparable(itemType)) Right(SnapiBoolType()) else Left(Seq(ItemsNotComparable(list))) } @@ -1499,9 +1499,9 @@ class ZipListEntry extends SugarEntryExtension with CollectionToListHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2ListType(itemType1, _) = mandatoryArgs.head.t - val Rql2ListType(itemType2, _) = mandatoryArgs(1).t - Right(Rql2ListType(Rql2RecordType(Vector(Rql2AttrType("_1", itemType1), Rql2AttrType("_2", itemType2))))) + val SnapiListType(itemType1, _) = mandatoryArgs.head.t + val SnapiListType(itemType2, _) = mandatoryArgs(1).t + Right(SnapiListType(SnapiRecordType(Vector(SnapiAttrType("_1", itemType1), SnapiAttrType("_2", itemType2))))) } override def desugar( @@ -1552,14 +1552,14 @@ class MkStringListEntry extends SugarEntryExtension with ListToCollectionHint { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - if (idx == 0) Right(ExpParam(Rql2ListType(Rql2StringType(Set(Rql2IsNullableTypeProperty()))))) - else Right(ExpParam(Rql2StringType())) + if (idx == 0) Right(ExpParam(SnapiListType(SnapiStringType(Set(SnapiIsNullableTypeProperty()))))) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("start", "sep", "end")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -1567,7 +1567,7 @@ class MkStringListEntry extends SugarEntryExtension with ListToCollectionHint { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiStringType(Set(SnapiIsTryableTypeProperty()))) } override def desugar( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LocationPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LocationPackage.scala similarity index 75% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LocationPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LocationPackage.scala index 8066e7611..0dd303cbf 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LocationPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LocationPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object LocationPackageBuilder { @@ -54,7 +54,7 @@ class LocationFromStringEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = None @@ -64,7 +64,7 @@ class LocationFromStringEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2LocationType()) + Right(SnapiLocationType()) } } @@ -114,52 +114,52 @@ class LocationDescribeEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2LocationType())) + Right(ExpParam(SnapiLocationType())) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = Right( - Rql2RecordType( + SnapiRecordType( Vector( - Rql2AttrType("format", Rql2StringType()), - Rql2AttrType("comment", Rql2StringType()), - Rql2AttrType("type", Rql2StringType()), - Rql2AttrType( + SnapiAttrType("format", SnapiStringType()), + SnapiAttrType("comment", SnapiStringType()), + SnapiAttrType("type", SnapiStringType()), + SnapiAttrType( "properties", - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("name", Rql2StringType()), - Rql2AttrType("value", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("name", SnapiStringType()), + SnapiAttrType("value", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) ), - Rql2AttrType("is_collection", Rql2BoolType()), - Rql2AttrType( + SnapiAttrType("is_collection", SnapiBoolType()), + SnapiAttrType( "columns", - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("col_name", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("col_type", Rql2StringType()), - Rql2AttrType("nullable", Rql2BoolType()) + SnapiAttrType("col_name", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("col_type", SnapiStringType()), + SnapiAttrType("nullable", SnapiBoolType()) ) ) ) ), - Rql2AttrType("sampled", Rql2BoolType()) + SnapiAttrType("sampled", SnapiBoolType()) ), - Set(Rql2IsTryableTypeProperty()) + Set(SnapiIsTryableTypeProperty()) ) ) override def optionalParams: Option[Set[String]] = Some(Set("sampleSize")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { - Right(ExpParam(Rql2IntType(Set(Rql2IsNullableTypeProperty())))) + Right(ExpParam(SnapiIntType(Set(SnapiIsNullableTypeProperty())))) } } @@ -183,7 +183,7 @@ class LocationLsEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2LocationType())) + Right(ExpParam(SnapiLocationType())) } override def returnType( @@ -191,7 +191,7 @@ class LocationLsEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = - Right(Rql2ListType(Rql2StringType(), Set(Rql2IsTryableTypeProperty()))) + Right(SnapiListType(SnapiStringType(), Set(SnapiIsTryableTypeProperty()))) } @@ -226,7 +226,7 @@ class LocationLlEntry() extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2LocationType())) + Right(ExpParam(SnapiLocationType())) } override def returnType( @@ -234,24 +234,24 @@ class LocationLlEntry() extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = Right( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("url", Rql2StringType()), - Rql2AttrType( + SnapiAttrType("url", SnapiStringType()), + SnapiAttrType( "metadata", - Rql2RecordType( + SnapiRecordType( Vector( - Rql2AttrType("modified", Rql2TimestampType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("size", Rql2LongType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType( + SnapiAttrType("modified", SnapiTimestampType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("size", SnapiLongType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType( "blocks", - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("hosts", Rql2ListType(Rql2StringType())), - Rql2AttrType("offset", Rql2LongType()), - Rql2AttrType("length", Rql2LongType()) + SnapiAttrType("hosts", SnapiListType(SnapiStringType())), + SnapiAttrType("offset", SnapiLongType()), + SnapiAttrType("length", SnapiLongType()) ) ) ) @@ -261,7 +261,7 @@ class LocationLlEntry() extends EntryExtension { ) ) ), - Set(Rql2IsTryableTypeProperty()) + Set(SnapiIsTryableTypeProperty()) ) ) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LongPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LongPackage.scala similarity index 85% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LongPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LongPackage.scala index 134572819..8f507e3d8 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/LongPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/LongPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object LongPackageBuilder { @@ -82,11 +82,11 @@ class LongFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2LongType(props)) + Right(SnapiLongType(props)) } } @@ -118,12 +118,12 @@ class LongRangeEntry extends EntryExtension { override def optionalParams: Option[Set[String]] = Some(Set("step")) override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2LongType())) + Right(ExpParam(SnapiLongType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { assert(idn == "step") - Right(ExpParam(Rql2LongType())) + Right(ExpParam(SnapiLongType())) } override def returnType( @@ -131,7 +131,7 @@ class LongRangeEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IterableType(Rql2LongType())) + Right(SnapiIterableType(SnapiLongType())) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MathPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/MathPackage.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MathPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/MathPackage.scala index 75ecd2562..4909d24f3 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MathPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/MathPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -24,7 +24,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ Param, ShortEntryExtension } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ class MathPackage extends PackageExtension { @@ -41,7 +41,7 @@ class MathPiEntry "Math", "Pi", Vector.empty, - Rql2DoubleType(), + SnapiDoubleType(), EntryDoc( summary = "Pi mathematical constant (3.14159...)", ret = Some(ReturnDoc("The value of pi.", Some(TypeDoc(List("double"))))) @@ -53,7 +53,7 @@ class MathRandomEntry "Math", "Random", Vector.empty, - Rql2DoubleType(), + SnapiDoubleType(), EntryDoc( summary = "Pseudo random number generator, returns a double between 0.0 and 1.0.", ret = Some(ReturnDoc("A random number.", Some(TypeDoc(List("double"))))) @@ -64,8 +64,8 @@ class MathPowerEntry extends ShortEntryExtension( "Math", "Power", - Vector(Rql2DoubleType(), Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType(), SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the first value to the power of the second value.", examples = List( @@ -84,8 +84,8 @@ class MathAtn2Entry extends ShortEntryExtension( "Math", "Atn2", - Vector(Rql2DoubleType(), Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType(), SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the angle in radians of the vector (x, y).", examples = List( @@ -125,7 +125,7 @@ class MathAbsEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(OneOfType(Rql2IntType(), Rql2LongType(), Rql2FloatType(), Rql2DoubleType()))) + Right(ExpParam(OneOfType(SnapiIntType(), SnapiLongType(), SnapiFloatType(), SnapiDoubleType()))) } override def nrMandatoryParams: Int = 1 @@ -136,7 +136,7 @@ class MathAbsEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { mandatoryArgs(0).t match { - case number: Rql2NumberType if !number.isInstanceOf[Rql2DecimalType] => Right(number) + case number: SnapiNumberType if !number.isInstanceOf[SnapiDecimalType] => Right(number) case _ => Left("unsupported type") } } @@ -147,8 +147,8 @@ class MathAcosEntry extends ShortEntryExtension( "Math", "Acos", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Arcosine, returns the angle in radians which cosine is specified by the value.", examples = List( @@ -165,8 +165,8 @@ class MathAsinEntry extends ShortEntryExtension( "Math", "Asin", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Arcsine, returns the angle in radians which sine is specified by the value.", examples = List( @@ -183,8 +183,8 @@ class MathAtanEntry extends ShortEntryExtension( "Math", "Atan", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Arctangent, returns the angle in radians which tangent is specified by the value.", examples = List( @@ -201,8 +201,8 @@ class MathCeilingEntry extends ShortEntryExtension( "Math", "Ceiling", - Vector(Rql2DecimalType()), - Rql2LongType(), + Vector(SnapiDecimalType()), + SnapiLongType(), EntryDoc( summary = "Returns the smallest integer greater or equal to the specified value.", examples = List( @@ -220,8 +220,8 @@ class MathCosEntry extends ShortEntryExtension( "Math", "Cos", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the cosine specified by the value in radians.", examples = List( @@ -237,8 +237,8 @@ class MathCotEntry extends ShortEntryExtension( "Math", "Cot", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the cotangent specified by the value in radians.", examples = List( @@ -254,8 +254,8 @@ class MathDegreesEntry extends ShortEntryExtension( "Math", "Degrees", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Converts an angle from radians to degrees.", examples = List( @@ -271,8 +271,8 @@ class MathExpEntry extends ShortEntryExtension( "Math", "Exp", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Return the exponential of the specified value.", examples = List( @@ -290,8 +290,8 @@ class MathLogEntry extends ShortEntryExtension( "Math", "Log", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the logarithm base *e* specified by the value.", examples = List( @@ -307,8 +307,8 @@ class MathLog10Entry extends ShortEntryExtension( "Math", "Log10", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the logarithm base 10 specified by the value.", params = @@ -325,8 +325,8 @@ class MathRadiansEntry extends ShortEntryExtension( "Math", "Radians", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Converts an angle from degrees to radians.", params = List(ParamDoc("value", TypeDoc(List("double")), "The angle in degrees to convert to radians.")), @@ -342,8 +342,8 @@ class MathSignEntry extends ShortEntryExtension( "Math", "Sign", - Vector(Rql2DoubleType()), - Rql2IntType(), + Vector(SnapiDoubleType()), + SnapiIntType(), EntryDoc( summary = "Returns the sign, 1, -1 or 0 for the specified value.", params = List(ParamDoc("value", TypeDoc(List("number")), "The value on which the sign is computed.")), @@ -360,8 +360,8 @@ class MathSinEntry extends ShortEntryExtension( "Math", "Sin", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the sine specified by the value in radians.", params = List(ParamDoc("value", TypeDoc(List("double")), "The value on which the sine is computed.")), @@ -377,8 +377,8 @@ class MathSqrtEntry extends ShortEntryExtension( "Math", "Sqrt", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the square root of the specified value.", params = List(ParamDoc("value", TypeDoc(List("double")), "The value on which the square root is computed.")), @@ -394,8 +394,8 @@ class MathTanEntry extends ShortEntryExtension( "Math", "Tan", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the tangent specified by the value in radians.", params = List(ParamDoc("value", TypeDoc(List("double")), "The value on which the tangent is computed.")), @@ -411,8 +411,8 @@ class MathSquareEntry extends ShortEntryExtension( "Math", "Square", - Vector(Rql2DoubleType()), - Rql2DoubleType(), + Vector(SnapiDoubleType()), + SnapiDoubleType(), EntryDoc( summary = "Returns the square value.", examples = List( @@ -428,8 +428,8 @@ class MathFloorEntry extends ShortEntryExtension( "Math", "Floor", - Vector(Rql2DecimalType()), - Rql2LongType(), + Vector(SnapiDecimalType()), + SnapiLongType(), EntryDoc( params = List(ParamDoc("value", TypeDoc(List("decimal")), "The value to be floored.")), summary = "Returns the largest integer not greater than the value.", diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MySQLPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/MySQLPackage.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MySQLPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/MySQLPackage.scala index 07b1ed4f8..bb6745aad 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/MySQLPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/MySQLPackage.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions._ -import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2StringValue} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions._ +import com.rawlabs.snapi.frontend.snapi.{ProgramContext, SnapiStringValue} +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerInput, SqlQueryInferrerOutput, @@ -95,15 +95,15 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 2) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -118,7 +118,7 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { val table = FunAppArg(StringConst(getStringValue(mandatoryArgs(1))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("MySQL"), "Read"), Vector(db, table, readType) ++ optArgs @@ -168,7 +168,7 @@ class MySQLInferAndReadEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } } @@ -236,17 +236,17 @@ class MySQLReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) if (idx == 2) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } @@ -358,15 +358,15 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 2) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -413,7 +413,7 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } @@ -428,7 +428,7 @@ class MySQLInferAndQueryEntry extends SugarEntryExtension { val query = FunAppArg(StringConst(getStringValue(mandatoryArgs(1))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("MySQL"), "Query"), Vector(db, query, readType) ++ optArgs @@ -501,17 +501,17 @@ class MySQLQueryEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) if (idx == 2) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } override def returnTypeErrorList( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullablePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/NullablePackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullablePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/NullablePackage.scala index b10525170..77aa8d9bf 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullablePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/NullablePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -77,7 +77,7 @@ class NullableEmptyEntry extends EntryExtension { override def hasVarArgs: Boolean = false override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(TypeParam(DoesNotHaveTypeProperties(Set(Rql2IsNullableTypeProperty())))) + case 0 => Right(TypeParam(DoesNotHaveTypeProperties(Set(SnapiIsNullableTypeProperty())))) } override def returnType( @@ -86,7 +86,7 @@ class NullableEmptyEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val TypeArg(t) = mandatoryArgs(0) - Right(addProp(t, Rql2IsNullableTypeProperty())) + Right(addProp(t, SnapiIsNullableTypeProperty())) } } @@ -110,7 +110,7 @@ class NullableBuildEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val t = addProp(mandatoryArgs(0).t, Rql2IsNullableTypeProperty()) + val t = addProp(mandatoryArgs(0).t, SnapiIsNullableTypeProperty()) Right(t) } @@ -143,7 +143,7 @@ class NullableIsNullEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(HasTypeProperties(Set(Rql2IsNullableTypeProperty())))) + Right(ExpParam(HasTypeProperties(Set(SnapiIsNullableTypeProperty())))) } override def returnType( @@ -151,7 +151,7 @@ class NullableIsNullEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2BoolType()) + Right(SnapiBoolType()) } } @@ -167,7 +167,7 @@ class NullableUnsafeGetEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(HasTypeProperties(Set(Rql2IsNullableTypeProperty())))) + Right(ExpParam(HasTypeProperties(Set(SnapiIsNullableTypeProperty())))) } override def returnType( @@ -176,7 +176,7 @@ class NullableUnsafeGetEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val ExpArg(_, t) = mandatoryArgs(0) - Right(removeProp(t, Rql2IsNullableTypeProperty())) + Right(removeProp(t, SnapiIsNullableTypeProperty())) } } @@ -192,12 +192,14 @@ class NullableTransformEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(HasTypeProperties(Set(Rql2IsNullableTypeProperty())))) + case 0 => Right(ExpParam(HasTypeProperties(Set(SnapiIsNullableTypeProperty())))) case 1 => val ExpArg(_, t) = prevMandatoryArgs(0) - val innerType = removeProp(t, Rql2IsNullableTypeProperty()) + val innerType = removeProp(t, SnapiIsNullableTypeProperty()) Right( - ExpParam(FunType(Vector(innerType), Vector.empty, DoesNotHaveTypeProperties(Set(Rql2IsNullableTypeProperty())))) + ExpParam( + FunType(Vector(innerType), Vector.empty, DoesNotHaveTypeProperties(Set(SnapiIsNullableTypeProperty()))) + ) ) } @@ -207,7 +209,7 @@ class NullableTransformEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val FunType(_, _, outType, _) = mandatoryArgs(1).t - val t = addProp(outType, Rql2IsNullableTypeProperty()) + val t = addProp(outType, SnapiIsNullableTypeProperty()) Right(t) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullableTryablePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/NullableTryablePackage.scala similarity index 88% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullableTryablePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/NullableTryablePackage.scala index 2e652eddd..a3fca4d9f 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/NullableTryablePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/NullableTryablePackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.typesafe.scalalogging.StrictLogging import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object NullableTryablePackageBuilder { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/OraclePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/OraclePackage.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/OraclePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/OraclePackage.scala index 63b8886cd..3980c7de4 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/OraclePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/OraclePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -29,7 +29,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.{ProgramContext, Rql2StringValue} +import com.rawlabs.snapi.frontend.snapi.{ProgramContext, SnapiStringValue} import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerInput, SqlQueryInferrerOutput, @@ -111,15 +111,15 @@ class OracleInferAndReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -135,7 +135,7 @@ class OracleInferAndReadEntry extends SugarEntryExtension { val table = FunAppArg(StringConst(getStringValue(mandatoryArgs(2))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("Oracle"), "Read"), Vector(db, schema, table, readType) ++ optArgs @@ -186,7 +186,7 @@ class OracleInferAndReadEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } } @@ -260,17 +260,17 @@ class OracleReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 4) if (idx == 3) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } @@ -385,15 +385,15 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 2) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -440,7 +440,7 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } @@ -455,7 +455,7 @@ class OracleInferAndQueryEntry extends SugarEntryExtension { val query = FunAppArg(StringConst(getStringValue(mandatoryArgs(1))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("Oracle"), "Query"), Vector(db, query, readType) ++ optArgs @@ -530,17 +530,17 @@ class OracleQueryEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) if (idx == 2) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/PostgreSQLPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/PostgreSQLPackage.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/PostgreSQLPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/PostgreSQLPackage.scala index da7608b2c..04bfc9c3b 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/PostgreSQLPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/PostgreSQLPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -30,7 +30,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerInput, SqlQueryInferrerOutput, @@ -112,15 +112,15 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -136,7 +136,7 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { val table = FunAppArg(StringConst(getStringValue(mandatoryArgs(2))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("PostgreSQL"), "Read"), Vector(db, schema, table, readType) ++ optArgs @@ -195,7 +195,7 @@ class PostgreSQLInferAndReadEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } } @@ -272,17 +272,17 @@ class PostgreSQLReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 4) if (idx == 3) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } @@ -396,15 +396,15 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 2) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -451,7 +451,7 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } @@ -466,7 +466,7 @@ class PostgreSQLInferAndQueryEntry extends SugarEntryExtension { val query = FunAppArg(StringConst(getStringValue(mandatoryArgs(1))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("PostgreSQL"), "Query"), Vector(db, query, readType) ++ optArgs @@ -542,17 +542,17 @@ class PostgreSQLQueryEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) if (idx == 2) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RecordPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/RecordPackage.scala similarity index 90% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RecordPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/RecordPackage.scala index 0c645a2de..77c487e72 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RecordPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/RecordPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -25,8 +25,8 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ Param, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.source.{Rql2RecordType, _} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.source.{SnapiRecordType, _} object RecordPackageBuilder { object Build { @@ -111,8 +111,8 @@ class RecordBuildEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { Right( - Rql2RecordType( - optionalArgs.map { case (i, arg: ExpArg) => Rql2AttrType(i, arg.t) }.to + SnapiRecordType( + optionalArgs.map { case (i, arg: ExpArg) => SnapiAttrType(i, arg.t) }.to ) ) } @@ -153,9 +153,9 @@ class RecordConcatEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2RecordType(atts1, props1) = mandatoryArgs(0).t - val Rql2RecordType(atts2, props2) = mandatoryArgs(1).t - Right(Rql2RecordType(atts1 ++ atts2, props1 ++ props2)) + val SnapiRecordType(atts1, props1) = mandatoryArgs(0).t + val SnapiRecordType(atts2, props2) = mandatoryArgs(1).t + Right(SnapiRecordType(atts1 ++ atts2, props1 ++ props2)) } } @@ -192,7 +192,7 @@ class RecordFieldsEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2ListType(Rql2StringType())) + Right(SnapiListType(SnapiStringType())) } } @@ -230,7 +230,7 @@ class RecordAddFieldEntry extends EntryExtension { override def optionalParams: Option[Set[String]] = Some(Set.empty) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { - val t = prevMandatoryArgs(0).asInstanceOf[ExpArg].t.asInstanceOf[Rql2RecordType] + val t = prevMandatoryArgs(0).asInstanceOf[ExpArg].t.asInstanceOf[SnapiRecordType] if (t.atts.exists(att => att.idn == idn)) { Left("field already exists in record") } else { @@ -244,8 +244,8 @@ class RecordAddFieldEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val Rql2RecordType(atts, _) = mandatoryArgs.head.t - Right(Rql2RecordType(atts ++ optionalArgs.map(a => Rql2AttrType(a._1, a._2.t)))) + val SnapiRecordType(atts, _) = mandatoryArgs.head.t + Right(SnapiRecordType(atts ++ optionalArgs.map(a => SnapiAttrType(a._1, a._2.t)))) } } @@ -278,7 +278,7 @@ class RecordRemoveFieldEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { case 0 => Right(ExpParam(ExpectedRecordType(Set.empty))) - case 1 => Right(ValueParam(Rql2StringType())) + case 1 => Right(ValueParam(SnapiStringType())) } } @@ -287,12 +287,12 @@ class RecordRemoveFieldEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val t = mandatoryArgs(0).asInstanceOf[ExpArg].t.asInstanceOf[Rql2RecordType] + val t = mandatoryArgs(0).asInstanceOf[ExpArg].t.asInstanceOf[SnapiRecordType] val idn = getStringValue(mandatoryArgs(1)) if (!t.atts.exists(att => att.idn == idn)) { Left(s"field $idn not found") } else { - Right(Rql2RecordType(t.atts.filter(att => att.idn != idn))) + Right(SnapiRecordType(t.atts.filter(att => att.idn != idn))) } } @@ -326,7 +326,7 @@ class RecordGetFieldByIndexEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { case 0 => Right(ExpParam(ExpectedRecordType(Set.empty))) - case 1 => Right(ValueParam(Rql2IntType())) + case 1 => Right(ValueParam(SnapiIntType())) } } @@ -335,7 +335,7 @@ class RecordGetFieldByIndexEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - val t = mandatoryArgs(0).asInstanceOf[ExpArg].t.asInstanceOf[Rql2RecordType] + val t = mandatoryArgs(0).asInstanceOf[ExpArg].t.asInstanceOf[SnapiRecordType] val idx = getIntValue(mandatoryArgs(1)) if (idx >= 1 && idx <= t.atts.length) { Right(t.atts(idx - 1).tipe) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RegexPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/RegexPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RegexPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/RegexPackage.scala index e52e3513e..a79373e12 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/RegexPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/RegexPackage.scala @@ -10,18 +10,18 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source.{ - Rql2BoolType, - Rql2IsNullableTypeProperty, - Rql2IsTryableTypeProperty, - Rql2ListType, - Rql2StringType +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source.{ + SnapiBoolType, + SnapiIsNullableTypeProperty, + SnapiIsTryableTypeProperty, + SnapiListType, + SnapiStringType } class RegexPackage extends PackageExtension { @@ -68,7 +68,7 @@ class RegexReplaceEntry extends EntryExtension { override def nrMandatoryParams: Int = 3 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -76,7 +76,7 @@ class RegexReplaceEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiStringType(Set(SnapiIsTryableTypeProperty()))) } } @@ -106,7 +106,7 @@ class RegexMatchesEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -114,7 +114,7 @@ class RegexMatchesEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2BoolType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiBoolType(Set(SnapiIsTryableTypeProperty()))) } } @@ -150,7 +150,7 @@ class RegexFirstMatchInEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -158,7 +158,7 @@ class RegexFirstMatchInEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))) + Right(SnapiStringType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))) } } @@ -193,7 +193,7 @@ class RegexGroupsEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -201,9 +201,9 @@ class RegexGroupsEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = Right( - Rql2ListType( - Rql2StringType(Set(Rql2IsNullableTypeProperty())), - Set(Rql2IsTryableTypeProperty()) + SnapiListType( + SnapiStringType(Set(SnapiIsNullableTypeProperty())), + Set(SnapiIsTryableTypeProperty()) ) ) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/S3Package.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/S3Package.scala similarity index 81% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/S3Package.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/S3Package.scala index 3a7ce6e6d..919569f34 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/S3Package.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/S3Package.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source.{Rql2LocationType, Rql2StringType} -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source.{SnapiLocationType, SnapiStringType} +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} class S3Package extends PackageExtension { @@ -56,15 +56,15 @@ class S3BuildEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("region", "accessKey", "secretKey")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = idn match { - case "region" => Right(ExpParam(Rql2StringType())) - case "accessKey" => Right(ExpParam(Rql2StringType())) - case "secretKey" => Right(ExpParam(Rql2StringType())) + case "region" => Right(ExpParam(SnapiStringType())) + case "accessKey" => Right(ExpParam(SnapiStringType())) + case "secretKey" => Right(ExpParam(SnapiStringType())) } override def returnType( @@ -72,7 +72,7 @@ class S3BuildEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2LocationType()) + Right(SnapiLocationType()) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SQLServerPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SQLServerPackage.scala similarity index 92% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SQLServerPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SQLServerPackage.scala index 4661bdc21..45048e4df 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SQLServerPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SQLServerPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -30,7 +30,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ ValueArg, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.snapi.frontend.inferrer.api.{ SqlQueryInferrerInput, SqlQueryInferrerOutput, @@ -113,15 +113,15 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -137,7 +137,7 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { val table = FunAppArg(StringConst(getStringValue(mandatoryArgs(2))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("SQLServer"), "Read"), Vector(db, schema, table, readType) ++ optArgs @@ -196,7 +196,7 @@ class SQLServerInferAndReadEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } } @@ -273,17 +273,17 @@ class SQLServerReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 4) if (idx == 3) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } @@ -398,15 +398,15 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 2) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ValueParam(Rql2StringType())) - case "port" => Right(ValueParam(Rql2IntType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "host" => Right(ValueParam(SnapiStringType())) + case "port" => Right(ValueParam(SnapiIntType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) } } @@ -453,7 +453,7 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, false, false) + inferTypeToSnapiType(tipe, false, false) } } @@ -468,7 +468,7 @@ class SQLServerInferAndQueryEntry extends SugarEntryExtension { val query = FunAppArg(StringConst(getStringValue(mandatoryArgs(1))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = - optionalArgs.map { case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } + optionalArgs.map { case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) } FunApp( Proj(PackageIdnExp("SQLServer"), "Query"), Vector(db, query, readType) ++ optArgs @@ -543,17 +543,17 @@ class SQLServerQueryEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) if (idx == 2) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("host", "username", "port", "password")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "host" => Right(ExpParam(Rql2StringType())) - case "port" => Right(ExpParam(Rql2IntType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "host" => Right(ExpParam(SnapiStringType())) + case "port" => Right(ExpParam(SnapiIntType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ShortPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ShortPackage.scala similarity index 81% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ShortPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ShortPackage.scala index a911f934c..9fe1fe7b3 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/ShortPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/ShortPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ object ShortPackageBuilder { @@ -74,11 +74,11 @@ class ShortFromEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { // Type as Try when passed a string in case the content doesn't parse. - val props: Set[Rql2TypeProperty] = mandatoryArgs(0).t match { - case _: Rql2StringType => Set(Rql2IsTryableTypeProperty()) - case _ => Set.empty[Rql2TypeProperty] + val props: Set[SnapiTypeProperty] = mandatoryArgs(0).t match { + case _: SnapiStringType => Set(SnapiIsTryableTypeProperty()) + case _ => Set.empty[SnapiTypeProperty] } - Right(Rql2ShortType(props)) + Right(SnapiShortType(props)) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SnowflakePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SnowflakePackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SnowflakePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SnowflakePackage.scala index a24f18fc3..72c42e4d2 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SnowflakePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SnowflakePackage.scala @@ -10,15 +10,15 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpArg, @@ -113,21 +113,21 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "accountID" => Right(ValueParam(Rql2StringType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "accountID" => Right(ValueParam(SnapiStringType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) case "options" => Right( ValueParam( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("_2", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("_1", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("_2", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) @@ -148,13 +148,13 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { val table = FunAppArg(StringConst(getStringValue(mandatoryArgs(2))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = optionalArgs.map { - case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) - case (idn, ValueArg(Rql2ListValue(v: Seq[Rql2RecordValue]), _)) => + case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) + case (idn, ValueArg(SnapiListValue(v: Seq[SnapiRecordValue]), _)) => val records = v.map { r => val fields = r.v.zipWithIndex.map { - case (Rql2RecordAttr(_, Rql2OptionValue(Some(Rql2StringValue(v)))), idx) => + case (SnapiRecordAttr(_, SnapiOptionValue(Some(SnapiStringValue(v)))), idx) => s"_${idx + 1}" -> NullablePackageBuilder.Build(StringConst(v)) - case (Rql2RecordAttr(_, Rql2OptionValue(None)), idx) => s"_${idx + 1}" -> NullablePackageBuilder.Empty(t) + case (SnapiRecordAttr(_, SnapiOptionValue(None)), idx) => s"_${idx + 1}" -> NullablePackageBuilder.Empty(t) }.toVector RecordPackageBuilder.Build(fields) } @@ -224,7 +224,7 @@ class SnowflakeInferAndReadEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlTableInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, makeNullable = false, makeTryable = false) + inferTypeToSnapiType(tipe, makeNullable = false, makeTryable = false) } } } @@ -301,23 +301,23 @@ class SnowflakeReadEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 4) if (idx == 3) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("accountID", "username", "password", "options")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "accountID" => Right(ExpParam(Rql2StringType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "accountID" => Right(ExpParam(SnapiStringType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) case "options" => Right( ExpParam( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("_2", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("_1", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("_2", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) @@ -442,21 +442,21 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 2) - Right(ValueParam(Rql2StringType())) + Right(ValueParam(SnapiStringType())) } override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "accountID" => Right(ValueParam(Rql2StringType())) - case "username" => Right(ValueParam(Rql2StringType())) - case "password" => Right(ValueParam(Rql2StringType())) + case "accountID" => Right(ValueParam(SnapiStringType())) + case "username" => Right(ValueParam(SnapiStringType())) + case "password" => Right(ValueParam(SnapiStringType())) case "options" => Right( ValueParam( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("_2", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("_1", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("_2", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) @@ -515,7 +515,7 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { inputFormatDescriptor <- programContext.infer(inferrerProperties); SqlQueryInferrerOutput(tipe) = inputFormatDescriptor ) yield { - inferTypeToRql2Type(tipe, makeNullable = false, makeTryable = false) + inferTypeToSnapiType(tipe, makeNullable = false, makeTryable = false) } } @@ -530,14 +530,14 @@ class SnowflakeInferAndQueryEntry extends SugarEntryExtension { val query = FunAppArg(StringConst(getStringValue(mandatoryArgs(1))), None) val readType = FunAppArg(TypeExp(t), None) val optArgs = optionalArgs.map { - case (idn, ValueArg(Rql2StringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) - case (idn, ValueArg(Rql2ListValue(v: Seq[Rql2RecordValue]), _)) => + case (idn, ValueArg(SnapiStringValue(s), _)) => FunAppArg(StringConst(s), Some(idn)) + case (idn, ValueArg(SnapiListValue(v: Seq[SnapiRecordValue]), _)) => // building a List of tuples val records = v.map { r => val fields = r.v.zipWithIndex.map { - case (Rql2RecordAttr(_, Rql2OptionValue(Some(Rql2StringValue(v)))), idx) => + case (SnapiRecordAttr(_, SnapiOptionValue(Some(SnapiStringValue(v)))), idx) => s"_${idx + 1}" -> NullablePackageBuilder.Build(StringConst(v)) - case (Rql2RecordAttr(_, Rql2OptionValue(None)), idx) => s"_${idx + 1}" -> NullablePackageBuilder.Empty(t) + case (SnapiRecordAttr(_, SnapiOptionValue(None)), idx) => s"_${idx + 1}" -> NullablePackageBuilder.Empty(t) }.toVector RecordPackageBuilder.Build(fields) @@ -620,23 +620,23 @@ class SnowflakeQueryEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) if (idx == 2) Right(TypeParam(AnythingType())) - else Right(ExpParam(Rql2StringType())) + else Right(ExpParam(SnapiStringType())) } override def optionalParams: Option[Set[String]] = Some(Set("accountID", "username", "password", "options")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "accountID" => Right(ExpParam(Rql2StringType())) - case "username" => Right(ExpParam(Rql2StringType())) - case "password" => Right(ExpParam(Rql2StringType())) + case "accountID" => Right(ExpParam(SnapiStringType())) + case "username" => Right(ExpParam(SnapiStringType())) + case "password" => Right(ExpParam(SnapiStringType())) case "options" => Right( ValueParam( - Rql2ListType( - Rql2RecordType( + SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("_1", Rql2StringType(Set(Rql2IsNullableTypeProperty()))), - Rql2AttrType("_2", Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + SnapiAttrType("_1", SnapiStringType(Set(SnapiIsNullableTypeProperty()))), + SnapiAttrType("_2", SnapiStringType(Set(SnapiIsNullableTypeProperty()))) ) ) ) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/StringPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/StringPackage.scala similarity index 88% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/StringPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/StringPackage.scala index 72d52e036..1426dc187 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/StringPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/StringPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -24,7 +24,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ Param, ShortEntryExtension } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ class StringPackage extends PackageExtension { @@ -39,7 +39,7 @@ class StringPackage extends PackageExtension { object StringPackage extends StringPackage { def outputWriteSupport(dataType: Type): Boolean = { - dataType.isInstanceOf[Rql2StringType] // nullable/tryable or not. All are supported + dataType.isInstanceOf[SnapiStringType] // nullable/tryable or not. All are supported } } @@ -71,19 +71,19 @@ class StringFromEntry extends EntryExtension { Right( ExpParam( OneOfType( - Rql2ByteType(), - Rql2ShortType(), - Rql2IntType(), - Rql2LongType(), - Rql2FloatType(), - Rql2DoubleType(), - Rql2DecimalType(), - Rql2BoolType(), - Rql2DateType(), - Rql2TimeType(), - Rql2TimestampType(), - Rql2IntervalType(), - Rql2LocationType() + SnapiByteType(), + SnapiShortType(), + SnapiIntType(), + SnapiLongType(), + SnapiFloatType(), + SnapiDoubleType(), + SnapiDecimalType(), + SnapiBoolType(), + SnapiDateType(), + SnapiTimeType(), + SnapiTimestampType(), + SnapiIntervalType(), + SnapiLocationType() ) ) ) @@ -93,7 +93,7 @@ class StringFromEntry extends EntryExtension { mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] - )(implicit programContext: ProgramContext): Either[String, Type] = Right(Rql2StringType()) + )(implicit programContext: ProgramContext): Either[String, Type] = Right(SnapiStringType()) } @@ -115,13 +115,13 @@ class StringReadEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2LocationType())) + Right(ExpParam(SnapiLocationType())) } override def optionalParams: Option[Set[String]] = Some(Set("encoding")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { - Right(ExpParam(Rql2StringType())) + Right(ExpParam(SnapiStringType())) } override def returnType( @@ -129,7 +129,7 @@ class StringReadEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType(Set(Rql2IsTryableTypeProperty()))) + Right(SnapiStringType(Set(SnapiIsTryableTypeProperty()))) } } @@ -138,8 +138,8 @@ class StringContainsEntry extends ShortEntryExtension( "String", "Contains", - Vector(Rql2StringType(), Rql2StringType()), - Rql2BoolType(), + Vector(SnapiStringType(), SnapiStringType()), + SnapiBoolType(), EntryDoc( summary = "Returns true if a given string contains another given string.", params = List( @@ -158,8 +158,8 @@ class StringTrimEntry extends ShortEntryExtension( "String", "Trim", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Removes white space characters from the beginning and end of a string.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to be trimmed.")), @@ -175,8 +175,8 @@ class StringLTrimEntry extends ShortEntryExtension( "String", "LTrim", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Removes white space characters from the beginning of a string.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to be trimmed.")), @@ -193,8 +193,8 @@ class StringRTrimEntry extends ShortEntryExtension( "String", "RTrim", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Removes white space characters from the end of a string.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to be trimmed.")), @@ -235,9 +235,9 @@ class StringReplaceEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx < 3) idx match { - case 0 => Right(ExpParam(Rql2StringType())) - case 1 => Right(ExpParam(Rql2StringType())) - case 2 => Right(ExpParam(Rql2StringType())) + case 0 => Right(ExpParam(SnapiStringType())) + case 1 => Right(ExpParam(SnapiStringType())) + case 2 => Right(ExpParam(SnapiStringType())) } } @@ -246,7 +246,7 @@ class StringReplaceEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType()) + Right(SnapiStringType()) } } @@ -255,8 +255,8 @@ class StringReverseEntry extends ShortEntryExtension( "String", "Reverse", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Reverses a string.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to reverse.")), @@ -269,8 +269,8 @@ class StringReplicateEntry extends ShortEntryExtension( "String", "Replicate", - Vector(Rql2StringType(), Rql2IntType()), - Rql2StringType(), + Vector(SnapiStringType(), SnapiIntType()), + SnapiStringType(), EntryDoc( summary = "Replicates a string by coping the substring for the specific number of repetitions.", params = List( @@ -289,8 +289,8 @@ class StringUpperEntry extends ShortEntryExtension( "String", "Upper", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Convert a string to uppercase.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to convert to uppercase.")), @@ -306,8 +306,8 @@ class StringLowerEntry extends ShortEntryExtension( "String", "Lower", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Convert a string to lowercase.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to convert to lowercase.")), @@ -323,8 +323,8 @@ class StringSplitEntry extends ShortEntryExtension( "String", "Split", - Vector(Rql2StringType(), Rql2StringType()), - Rql2ListType(Rql2StringType()), + Vector(SnapiStringType(), SnapiStringType()), + SnapiListType(SnapiStringType()), EntryDoc( summary = "Split a string into a list of strings given a separator.", params = List( @@ -349,8 +349,8 @@ class StringLengthEntry extends ShortEntryExtension( "String", "Length", - Vector(Rql2StringType()), - Rql2IntType(), + Vector(SnapiStringType()), + SnapiIntType(), EntryDoc( summary = "Compute the size of a string.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to compute the size.")), @@ -362,8 +362,8 @@ class StringSubStringEntry extends ShortEntryExtension( "String", "SubString", - Vector(Rql2StringType(), Rql2IntType(), Rql2IntType()), - Rql2StringType(), + Vector(SnapiStringType(), SnapiIntType(), SnapiIntType()), + SnapiStringType(), EntryDoc( summary = """Extract a substring from a string, given the start index and length of extraction.""", info = Some("""The index starts at 1. A negative number as the length means the remainder of the string."""), @@ -384,8 +384,8 @@ class StringCountSubStringEntry extends ShortEntryExtension( "String", "CountSubString", - Vector(Rql2StringType(), Rql2StringType()), - Rql2IntType(), + Vector(SnapiStringType(), SnapiStringType()), + SnapiIntType(), EntryDoc( summary = "Count the number of occurrences of a substring in a string.", params = List( @@ -405,8 +405,8 @@ class StringStartsWithEntry extends ShortEntryExtension( "String", "StartsWith", - Vector(Rql2StringType(), Rql2StringType()), - Rql2BoolType(), + Vector(SnapiStringType(), SnapiStringType()), + SnapiBoolType(), EntryDoc( summary = """Check if a string starts with a given prefix.""", params = List( @@ -430,8 +430,8 @@ class StringEmptyEntry extends ShortEntryExtension( "String", "Empty", - Vector(Rql2StringType()), - Rql2BoolType(), + Vector(SnapiStringType()), + SnapiBoolType(), EntryDoc( summary = """Returns true the string is empty.""", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to check if empty.")), @@ -447,8 +447,8 @@ class Base64EntryExtension extends ShortEntryExtension( "String", "Base64", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Returns the base64 encoding of a string", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to encode as base64.")), @@ -461,8 +461,8 @@ class StringEncodeEntry extends ShortEntryExtension( "String", "Encode", - Vector(Rql2StringType(), Rql2StringType()), - Rql2BinaryType(Set(Rql2IsTryableTypeProperty())), + Vector(SnapiStringType(), SnapiStringType()), + SnapiBinaryType(Set(SnapiIsTryableTypeProperty())), EntryDoc( summary = "Converts a string to a binary, given an encoding.", params = List( @@ -478,8 +478,8 @@ class StringDecodeEntry extends ShortEntryExtension( "String", "Decode", - Vector(Rql2BinaryType(), Rql2StringType()), - Rql2StringType(Set(Rql2IsTryableTypeProperty())), + Vector(SnapiBinaryType(), SnapiStringType()), + SnapiStringType(Set(SnapiIsTryableTypeProperty())), EntryDoc( summary = "Builds a string from a binary, given an encoding.", params = List( @@ -503,8 +503,8 @@ class StringLevenshteinDistanceEntry extends ShortEntryExtension( "String", "LevenshteinDistance", - Vector(Rql2StringType(), Rql2StringType()), - Rql2IntType(), + Vector(SnapiStringType(), SnapiStringType()), + SnapiIntType(), EntryDoc( summary = """Calculates the Levenshtein distance between two strings.""", info = Some( @@ -555,7 +555,7 @@ class StringReadLinesEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2LocationType())) + Right(ExpParam(SnapiLocationType())) } override def optionalParams: Option[Set[String]] = Some(Set("encoding")) @@ -565,7 +565,7 @@ class StringReadLinesEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IterableType(Rql2StringType())) + Right(SnapiIterableType(SnapiStringType())) } } @@ -573,8 +573,8 @@ class StringCapitalizeEntry extends ShortEntryExtension( "String", "Capitalize", - Vector(Rql2StringType()), - Rql2StringType(), + Vector(SnapiStringType()), + SnapiStringType(), EntryDoc( summary = "Makes the first character of a string be uppercase and the rest lowercase.", params = List(ParamDoc("string", TypeDoc(List("string")), "The string to be capitalized.")), diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SuccessPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SuccessPackage.scala similarity index 76% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SuccessPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SuccessPackage.scala index c8a1a7a1f..ea80c5b75 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/SuccessPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/SuccessPackage.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source.{ +import com.rawlabs.snapi.frontend.snapi.source.{ Exp, FunApp, FunAppArg, PackageIdnExp, Proj, - Rql2IsTryableTypeProperty, - Rql2TypeWithProperties + SnapiIsTryableTypeProperty, + SnapiTypeWithProperties } -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpParam, PackageExtension, Param} object SuccessPackageBuilder { @@ -63,11 +63,11 @@ class SuccessBuildEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { mandatoryArgs(0).t match { - case x: Rql2TypeWithProperties if x.props.contains(Rql2IsTryableTypeProperty()) => + case x: SnapiTypeWithProperties if x.props.contains(SnapiIsTryableTypeProperty()) => return Left("argument is tryable") case _ => } - val t = addProp(mandatoryArgs(0).t, Rql2IsTryableTypeProperty()) + val t = addProp(mandatoryArgs(0).t, SnapiIsTryableTypeProperty()) Right(t) } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TestPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TestPackage.scala similarity index 79% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TestPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TestPackage.scala index 81ea0abdb..82d087e62 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TestPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TestPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, PackageDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions._ -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.source.Exp +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.source.Exp class TestPackage extends PackageExtension { @@ -39,7 +39,7 @@ class MandatoryExpArgsEntry extends EntryExtension { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx <= 2) - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) } override def returnType( @@ -47,7 +47,7 @@ class MandatoryExpArgsEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IntType()) + Right(SnapiIntType()) } } @@ -59,7 +59,7 @@ class MandatoryValueArgsEntry extends MandatoryExpArgsEntry { override def entryName: String = "MandatoryValueArgs" override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ValueParam(Rql2IntType())) + Right(ValueParam(SnapiIntType())) } class OptionalExpArgsTestEntry extends EntryExtension { @@ -73,19 +73,19 @@ class OptionalExpArgsTestEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) override def optionalParams: Option[Set[String]] = Some(Set("x", "y")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IntType()) + Right(SnapiIntType()) } } @@ -101,19 +101,19 @@ class OptionalValueArgSugar extends SugarEntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) override def optionalParams: Option[Set[String]] = Some(Set("x")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = - Right(ValueParam(Rql2IntType())) + Right(ValueParam(SnapiIntType())) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IntType()) + Right(SnapiIntType()) } override def desugar( @@ -125,7 +125,7 @@ class OptionalValueArgSugar extends SugarEntryExtension { )(implicit programContext: ProgramContext): Exp = { val mandatory = FunAppArg(mandatoryArgs.head.asInstanceOf[ExpArg].e, None) val optionalX = { - val arg = optionalArgs.find(_._1 == "x").get._2.asInstanceOf[ValueArg].v.asInstanceOf[Rql2IntValue] + val arg = optionalArgs.find(_._1 == "x").get._2.asInstanceOf[ValueArg].v.asInstanceOf[SnapiIntValue] FunAppArg(IntConst(arg.v.toString), Some("x")) } val optionalY = FunAppArg(IntConst("10"), Some("y")) @@ -138,7 +138,7 @@ class OptionalValueArgsTestEntry extends OptionalExpArgsTestEntry { override def entryName: String = "OptionalValueArgs" override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = - Right(ValueParam(Rql2IntType())) + Right(ValueParam(SnapiIntType())) } @@ -155,14 +155,14 @@ class VarExpArgsTestEntry extends EntryExtension { override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2IntType())) + Right(ExpParam(SnapiIntType())) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IntType()) + Right(SnapiIntType()) } } @@ -172,7 +172,7 @@ class VarValueArgsTestEntry extends VarExpArgsTestEntry { override def entryName: String = "VarValueArgs" override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ValueParam(Rql2IntType())) + Right(ValueParam(SnapiIntType())) } @@ -189,14 +189,14 @@ class VarValueArgSugarTestEntry extends SugarEntryExtension { override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ValueParam(Rql2IntType())) + Right(ValueParam(SnapiIntType())) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IntType()) + Right(SnapiIntType()) } override def desugar( @@ -209,7 +209,7 @@ class VarValueArgSugarTestEntry extends SugarEntryExtension { val varArg1 = FunAppArg(IntConst("1"), None) val varArg2 = FunAppArg(IntConst("2"), None) val valueArgs = - varArgs.map { case ValueArg(v, _) => FunAppArg(IntConst(v.asInstanceOf[Rql2IntValue].v.toString), None) } + varArgs.map { case ValueArg(v, _) => FunAppArg(IntConst(v.asInstanceOf[SnapiIntValue].v.toString), None) } FunApp(Proj(PackageIdnExp("TestPackage"), "VarValueArgs"), Vector(varArg1, varArg2) ++ valueArgs) } @@ -228,14 +228,14 @@ class VarNullableStringValueTestEntry extends EntryExtension { override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ValueParam(Rql2StringType(Set(Rql2IsNullableTypeProperty())))) + Right(ValueParam(SnapiStringType(Set(SnapiIsNullableTypeProperty())))) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType()) + Right(SnapiStringType()) } } @@ -253,14 +253,14 @@ class VarNullableStringExpTestEntry extends EntryExtension { override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = - Right(ExpParam(Rql2StringType(Set(Rql2IsNullableTypeProperty())))) + Right(ExpParam(SnapiStringType(Set(SnapiIsNullableTypeProperty())))) override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2StringType(Set(Rql2IsNullableTypeProperty()))) + Right(SnapiStringType(Set(SnapiIsNullableTypeProperty()))) } } @@ -276,21 +276,22 @@ class StrictArgsTestEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(Rql2ListType(Rql2IntType()))) + case 0 => Right(ExpParam(SnapiListType(SnapiIntType()))) } override def optionalParams: Option[Set[String]] = Some(Set("r")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = idn match { - case "r" => - Right(ExpParam(Rql2RecordType(Vector(Rql2AttrType("a", Rql2LongType()), Rql2AttrType("b", Rql2FloatType()))))) + case "r" => Right( + ExpParam(SnapiRecordType(Vector(SnapiAttrType("a", SnapiLongType()), SnapiAttrType("b", SnapiFloatType())))) + ) } override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] - )(implicit programContext: ProgramContext): Either[String, Type] = Right(Rql2FloatType()) + )(implicit programContext: ProgramContext): Either[String, Type] = Right(SnapiFloatType()) } @@ -305,14 +306,14 @@ class StrictArgsColPassThroughTestEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(Rql2IterableType(Rql2IntType()))) + case 0 => Right(ExpParam(SnapiIterableType(SnapiIntType()))) } override def returnType( mandatoryArgs: Seq[Arg], optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] - )(implicit programContext: ProgramContext): Either[String, Type] = Right(Rql2IterableType(Rql2IntType())) + )(implicit programContext: ProgramContext): Either[String, Type] = Right(SnapiIterableType(SnapiIntType())) } @@ -327,7 +328,7 @@ class StrictArgsColConsumeTestEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = idx match { - case 0 => Right(ExpParam(Rql2IterableType(Rql2IntType()))) + case 0 => Right(ExpParam(SnapiIterableType(SnapiIntType()))) } override def returnType( @@ -335,7 +336,7 @@ class StrictArgsColConsumeTestEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = - Right(Rql2ListType(Rql2IntType(), Set(Rql2IsTryableTypeProperty()))) + Right(SnapiListType(SnapiIntType(), Set(SnapiIsTryableTypeProperty()))) } @@ -355,69 +356,69 @@ abstract class ValueArgTestEntry(t: Type) extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2RecordType(Vector(Rql2AttrType("arg", t)))) + Right(SnapiRecordType(Vector(SnapiAttrType("arg", t)))) } } -class ByteValueArgTestEntry extends ValueArgTestEntry(Rql2ByteType()) { +class ByteValueArgTestEntry extends ValueArgTestEntry(SnapiByteType()) { override def entryName: String = "ByteValueArg" } -class ShortValueArgTestEntry extends ValueArgTestEntry(Rql2ShortType()) { +class ShortValueArgTestEntry extends ValueArgTestEntry(SnapiShortType()) { override def entryName: String = "ShortValueArg" } -class IntValueArgTestEntry extends ValueArgTestEntry(Rql2IntType()) { +class IntValueArgTestEntry extends ValueArgTestEntry(SnapiIntType()) { override def entryName: String = "IntValueArg" } -class LongValueArgTestEntry extends ValueArgTestEntry(Rql2LongType()) { +class LongValueArgTestEntry extends ValueArgTestEntry(SnapiLongType()) { override def entryName: String = "LongValueArg" } -class FloatValueArgTestEntry extends ValueArgTestEntry(Rql2FloatType()) { +class FloatValueArgTestEntry extends ValueArgTestEntry(SnapiFloatType()) { override def entryName: String = "FloatValueArg" } -class DoubleValueArgTestEntry extends ValueArgTestEntry(Rql2DoubleType()) { +class DoubleValueArgTestEntry extends ValueArgTestEntry(SnapiDoubleType()) { override def entryName: String = "DoubleValueArg" } -class StringValueArgTestEntry extends ValueArgTestEntry(Rql2StringType()) { +class StringValueArgTestEntry extends ValueArgTestEntry(SnapiStringType()) { override def entryName: String = "StringValueArg" } -class BoolValueArgTestEntry extends ValueArgTestEntry(Rql2BoolType()) { +class BoolValueArgTestEntry extends ValueArgTestEntry(SnapiBoolType()) { override def entryName: String = "BoolValueArg" } -class DateValueArgTestEntry extends ValueArgTestEntry(Rql2DateType()) { +class DateValueArgTestEntry extends ValueArgTestEntry(SnapiDateType()) { override def entryName: String = "DateValueArg" } -class TimeValueArgTestEntry extends ValueArgTestEntry(Rql2TimeType()) { +class TimeValueArgTestEntry extends ValueArgTestEntry(SnapiTimeType()) { override def entryName: String = "TimeValueArg" } -class TimestampValueArgTestEntry extends ValueArgTestEntry(Rql2TimestampType()) { +class TimestampValueArgTestEntry extends ValueArgTestEntry(SnapiTimestampType()) { override def entryName: String = "TimestampValueArg" } -class IntervalValueArgTestEntry extends ValueArgTestEntry(Rql2IntervalType()) { +class IntervalValueArgTestEntry extends ValueArgTestEntry(SnapiIntervalType()) { override def entryName: String = "IntervalValueArg" } class RecordValueArgTestEntry extends ValueArgTestEntry( - Rql2RecordType(Vector(Rql2AttrType("a", Rql2IntType()), Rql2AttrType("b", Rql2FloatType()))) + SnapiRecordType(Vector(SnapiAttrType("a", SnapiIntType()), SnapiAttrType("b", SnapiFloatType()))) ) { override def entryName: String = "RecordValueArg" } class ListValueArgTestEntry extends ValueArgTestEntry( - Rql2ListType(Rql2IntType()) + SnapiListType(SnapiIntType()) ) { override def entryName: String = "ListValueArg" } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TimePackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TimePackage.scala index d9818a655..403112740 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TimePackage.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} -import com.rawlabs.snapi.frontend.rql2.extensions.{PackageExtension, ShortEntryExtension} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{PackageExtension, ShortEntryExtension} +import com.rawlabs.snapi.frontend.snapi.source._ import java.time.{LocalDate, LocalTime} import scala.collection.immutable.ListMap @@ -69,8 +69,8 @@ class TimeBuildEntry extends ShortEntryExtension( "Time", "Build", - mandatoryParams = Vector(Rql2IntType(), Rql2IntType()), - returnType = Rql2TimeType(Set(Rql2IsTryableTypeProperty())), + mandatoryParams = Vector(SnapiIntType(), SnapiIntType()), + returnType = SnapiTimeType(Set(SnapiIsTryableTypeProperty())), docs = EntryDoc( "Builds a time value.", params = List( @@ -92,8 +92,8 @@ class TimeBuildEntry ret = Some(ReturnDoc("The time built from the given components.", retType = Some(TypeDoc(List("time"))))) ), optionalParamsMap = ListMap( - "seconds" -> ((Rql2IntType(), IntConst("0"))), - "millis" -> ((Rql2IntType(), IntConst("0"))) + "seconds" -> ((SnapiIntType(), IntConst("0"))), + "millis" -> ((SnapiIntType(), IntConst("0"))) ) ) @@ -101,8 +101,8 @@ class TimeParseEntry extends ShortEntryExtension( "Time", "Parse", - mandatoryParams = Vector(Rql2StringType(), Rql2StringType()), - returnType = Rql2TimeType(Set(Rql2IsTryableTypeProperty())), + mandatoryParams = Vector(SnapiStringType(), SnapiStringType()), + returnType = SnapiTimeType(Set(SnapiIsTryableTypeProperty())), EntryDoc( summary = "Parses a time from a string.", description = Some( @@ -125,7 +125,7 @@ class TimeNowEntry "Time", "Now", mandatoryParams = Vector(), - returnType = Rql2TimeType(), + returnType = SnapiTimeType(), EntryDoc( summary = "Returns the current time.", examples = List(ExampleDoc("""Time.Now()""")), @@ -137,8 +137,8 @@ class TimeHourEntry extends ShortEntryExtension( "Time", "Hour", - mandatoryParams = Vector(Rql2TimeType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimeType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the hours component of a time.", params = List( @@ -153,8 +153,8 @@ class TimeMinuteEntry extends ShortEntryExtension( "Time", "Minute", - mandatoryParams = Vector(Rql2TimeType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimeType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the minutes component of a time.", params = List( @@ -169,8 +169,8 @@ class TimeSecondEntry extends ShortEntryExtension( "Time", "Second", - mandatoryParams = Vector(Rql2TimeType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimeType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the seconds component of a time.", params = List( @@ -185,8 +185,8 @@ class TimeMillisEntry extends ShortEntryExtension( "Time", "Millis", - mandatoryParams = Vector(Rql2TimeType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimeType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the milliseconds component of a time.", params = List( @@ -201,8 +201,8 @@ class TimeSubtractEntry extends ShortEntryExtension( "Time", "Subtract", - mandatoryParams = Vector(Rql2TimeType(), Rql2TimeType()), - returnType = Rql2IntervalType(), + mandatoryParams = Vector(SnapiTimeType(), SnapiTimeType()), + returnType = SnapiIntervalType(), EntryDoc( summary = "Subtracts two times.", params = List( @@ -227,8 +227,8 @@ class TimeAddIntervalEntry extends ShortEntryExtension( "Time", "AddInterval", - mandatoryParams = Vector(Rql2TimeType(), Rql2IntervalType()), - returnType = Rql2TimeType(), + mandatoryParams = Vector(SnapiTimeType(), SnapiIntervalType()), + returnType = SnapiTimeType(), EntryDoc( summary = """Adds an interval to a time.""", warning = Some("Note that years, months, weeks and days of interval will be ignored."), @@ -259,8 +259,8 @@ class TimeSubtractIntervalEntry extends ShortEntryExtension( "Time", "SubtractInterval", - mandatoryParams = Vector(Rql2TimeType(), Rql2IntervalType()), - returnType = Rql2TimeType(), + mandatoryParams = Vector(SnapiTimeType(), SnapiIntervalType()), + returnType = SnapiTimeType(), EntryDoc( summary = """Subtracts an interval to a time.""", warning = Some("""Note that years, months, weeks and days of interval will be ignored."""), diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimestampPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TimestampPackage.scala similarity index 88% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimestampPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TimestampPackage.scala index 0681b465b..11d8faeff 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TimestampPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TimestampPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -76,8 +76,8 @@ class TimestampBuildEntry extends ShortEntryExtension( "Timestamp", "Build", - mandatoryParams = Vector(Rql2IntType(), Rql2IntType(), Rql2IntType(), Rql2IntType(), Rql2IntType()), - returnType = Rql2TimestampType(Set(Rql2IsTryableTypeProperty())), + mandatoryParams = Vector(SnapiIntType(), SnapiIntType(), SnapiIntType(), SnapiIntType(), SnapiIntType()), + returnType = SnapiTimestampType(Set(SnapiIsTryableTypeProperty())), docs = EntryDoc( "Builds a timestamp value", params = List( @@ -104,8 +104,8 @@ class TimestampBuildEntry ) ), optionalParamsMap = ListMap( - "seconds" -> ((Rql2IntType(), IntConst("0"))), - "millis" -> ((Rql2IntType(), IntConst("0"))) + "seconds" -> ((SnapiIntType(), IntConst("0"))), + "millis" -> ((SnapiIntType(), IntConst("0"))) ) ) @@ -113,8 +113,8 @@ class TimestampFromDateEntry extends ShortEntryExtension( "Timestamp", "FromDate", - Vector(Rql2DateType()), - Rql2TimestampType(), + Vector(SnapiDateType()), + SnapiTimestampType(), EntryDoc( summary = "Builds a timestamp from a date.", params = List( @@ -130,8 +130,8 @@ class TimestampParseEntry extends ShortEntryExtension( "Timestamp", "Parse", - mandatoryParams = Vector(Rql2StringType(), Rql2StringType()), - returnType = Rql2TimestampType(Set(Rql2IsTryableTypeProperty())), + mandatoryParams = Vector(SnapiStringType(), SnapiStringType()), + returnType = SnapiTimestampType(Set(SnapiIsTryableTypeProperty())), EntryDoc( summary = "Parses a timestamp from a string.", description = Some( @@ -160,7 +160,7 @@ class TimestampNowEntry "Timestamp", "Now", mandatoryParams = Vector(), - returnType = Rql2TimestampType(), + returnType = SnapiTimestampType(), EntryDoc( summary = "Returns the current timestamp.", examples = List(ExampleDoc("""Timestamp.Now()""")), @@ -197,14 +197,14 @@ class TimestampRangeEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2TimestampType())) + Right(ExpParam(SnapiTimestampType())) } override def optionalParams: Option[Set[String]] = Some(Set("step")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { assert(idn == "step") - Right(ExpParam(Rql2IntervalType())) + Right(ExpParam(SnapiIntervalType())) } override def returnType( @@ -212,7 +212,7 @@ class TimestampRangeEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2IterableType(Rql2TimestampType())) + Right(SnapiIterableType(SnapiTimestampType())) } } @@ -221,8 +221,8 @@ class TimestampYearEntry extends ShortEntryExtension( "Timestamp", "Year", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the year component of the timestamp.", params = List( @@ -237,8 +237,8 @@ class TimestampMonthEntry extends ShortEntryExtension( "Timestamp", "Month", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the month component of the timestamp.", params = List( @@ -257,8 +257,8 @@ class TimestampDayEntry extends ShortEntryExtension( "Timestamp", "Day", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the day component of the timestamp.", params = List( @@ -273,8 +273,8 @@ class TimestampHourEntry extends ShortEntryExtension( "Timestamp", "Hour", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the hours component of the timestamp.", params = List( @@ -293,8 +293,8 @@ class TimestampMinuteEntry extends ShortEntryExtension( "Timestamp", "Minute", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns minutes part of the timestamp as an integer.", params = List( @@ -313,8 +313,8 @@ class TimestampSecondEntry extends ShortEntryExtension( "Timestamp", "Second", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the seconds component of the timestamp.", params = List( @@ -335,8 +335,8 @@ class TimestampMillisEntry extends ShortEntryExtension( "Timestamp", "Millis", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2IntType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiIntType(), EntryDoc( summary = "Returns the milliseconds component of the timestamp.", params = List( @@ -360,8 +360,8 @@ class TimestampFromUnixTimestampEntry extends ShortEntryExtension( "Timestamp", "FromUnixTimestamp", - mandatoryParams = Vector(Rql2LongType()), - returnType = Rql2TimestampType(), + mandatoryParams = Vector(SnapiLongType()), + returnType = SnapiTimestampType(), EntryDoc( summary = "Builds a timestamp from a Unix epoch (number of seconds since 01-01-1970).", params = List( @@ -381,8 +381,8 @@ class TimestampToUnixTimestampEntry extends ShortEntryExtension( "Timestamp", "ToUnixTimestamp", - mandatoryParams = Vector(Rql2TimestampType()), - returnType = Rql2LongType(), + mandatoryParams = Vector(SnapiTimestampType()), + returnType = SnapiLongType(), EntryDoc( summary = "Converts a timestamp into the corresponding Unix epoch (number of seconds since 01-01-1970).", params = List(ParamDoc("timestamp", TypeDoc(List("timestamp")), "Timestamp to convert to Unix epoch.")), @@ -457,8 +457,8 @@ class TimestampTimeBucketEntry extends EntryExtension { override def nrMandatoryParams: Int = 2 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - if (idx == 0) Right(ExpParam(OneOfType(Rql2StringType(), Rql2IntervalType()))) - else Right(ExpParam(Rql2TimestampType())) + if (idx == 0) Right(ExpParam(OneOfType(SnapiStringType(), SnapiIntervalType()))) + else Right(ExpParam(SnapiTimestampType())) } override def returnType( @@ -466,7 +466,7 @@ class TimestampTimeBucketEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(Rql2TimestampType()) + Right(SnapiTimestampType()) } } @@ -475,8 +475,8 @@ class TimestampSubtractEntry extends ShortEntryExtension( "Timestamp", "Subtract", - mandatoryParams = Vector(Rql2TimestampType(), Rql2TimestampType()), - returnType = Rql2IntervalType(), + mandatoryParams = Vector(SnapiTimestampType(), SnapiTimestampType()), + returnType = SnapiIntervalType(), EntryDoc( summary = "Subtracts two timestamps.", params = List( @@ -506,8 +506,8 @@ class TimestampAddIntervalEntry extends ShortEntryExtension( "Timestamp", "AddInterval", - mandatoryParams = Vector(Rql2TimestampType(), Rql2IntervalType()), - returnType = Rql2TimestampType(), + mandatoryParams = Vector(SnapiTimestampType(), SnapiIntervalType()), + returnType = SnapiTimestampType(), EntryDoc( summary = "Adds an interval to a timestamp.", params = List( @@ -537,8 +537,8 @@ class TimestampSubtractIntervalEntry extends ShortEntryExtension( "Timestamp", "SubtractInterval", - mandatoryParams = Vector(Rql2TimestampType(), Rql2IntervalType()), - returnType = Rql2TimestampType(), + mandatoryParams = Vector(SnapiTimestampType(), SnapiIntervalType()), + returnType = SnapiTimestampType(), EntryDoc( summary = "Subtracts an interval to a timestamp.", params = List( diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TryPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TryPackage.scala similarity index 87% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TryPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TryPackage.scala index f9479288c..28eeeeb76 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TryPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TryPackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, EntryExtension, ExpArg, ExpParam, PackageExtension, Param} object TryPackageBuilder { @@ -62,9 +62,9 @@ class TryTransformEntry extends EntryExtension { case 0 => Right(ExpParam(IsTryable())) case 1 => val ExpArg(_, t) = prevMandatoryArgs(0) - val innerType = removeProp(t, Rql2IsTryableTypeProperty()) + val innerType = removeProp(t, SnapiIsTryableTypeProperty()) Right( - ExpParam(FunType(Vector(innerType), Vector.empty, DoesNotHaveTypeProperties(Set(Rql2IsTryableTypeProperty())))) + ExpParam(FunType(Vector(innerType), Vector.empty, DoesNotHaveTypeProperties(Set(SnapiIsTryableTypeProperty())))) ) } @@ -74,7 +74,7 @@ class TryTransformEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val FunType(_, _, outType, _) = mandatoryArgs(1).t - val t = addProp(outType, Rql2IsTryableTypeProperty()) + val t = addProp(outType, SnapiIsTryableTypeProperty()) Right(t) } @@ -109,8 +109,8 @@ class TryIsErrorEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = mandatoryArgs(0).t match { - case _: Rql2IterableType => Left("cannot be applied to a collection") - case _ => Right(Rql2BoolType()) + case _: SnapiIterableType => Left("cannot be applied to a collection") + case _ => Right(SnapiBoolType()) } } @@ -144,8 +144,8 @@ class TryIsSuccessEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = mandatoryArgs(0).t match { - case _: Rql2IterableType => Left("cannot be applied to a collection") - case _ => Right(Rql2BoolType()) + case _: SnapiIterableType => Left("cannot be applied to a collection") + case _ => Right(SnapiBoolType()) } } @@ -171,7 +171,7 @@ class TryFlatMapEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val FunType(_, _, outType, _) = mandatoryArgs(1).t - assert(getProps(outType).contains(Rql2IsTryableTypeProperty())) + assert(getProps(outType).contains(SnapiIsTryableTypeProperty())) Right(outType) } @@ -198,7 +198,7 @@ class TryUnsafeGetEntry extends EntryExtension { optionalArgs: Seq[(String, Arg)], varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { - Right(removeProp(mandatoryArgs(0).t, Rql2IsTryableTypeProperty())) + Right(removeProp(mandatoryArgs(0).t, SnapiIsTryableTypeProperty())) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TypePackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TypePackage.scala similarity index 88% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TypePackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TypePackage.scala index 02cf3d9ec..04e91d469 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/TypePackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/TypePackage.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.source.{AnythingType, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, ExpParam, @@ -25,7 +25,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ TypeArg, TypeParam } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ object TypePackageBuilder { @@ -118,29 +118,30 @@ class TypeProtectCastEntry extends EntryExtension { val TypeArg(source) = mandatoryArgs(0) val TypeArg(target) = mandatoryArgs(1) // run a comparison of source and target. The 'source' type has nullables and tryables in place 'target' doesn't. - // * when nullables are found, output type gets Rql2IsNullableProperty - // * when tryables are found, output type gets Rql2IsTryableProperty + // * when nullables are found, output type gets SnapiIsNullableProperty + // * when tryables are found, output type gets SnapiIsTryableProperty // // Possibly both are found. Flags are added to the top of target (the one without the unexpected nested nullables/tryables) Right(addProps(target, extraProps(target, source))) } - // cloned from rql2.SemanticAnalyzer + // cloned from snapi.SemanticAnalyzer // TODO (bgaidioz) share the code somewhere? private def extraProps(target: Type, source: Type) = { - def recurse(target: Type, source: Type): Set[Rql2TypeProperty] = (target, source) match { - case (Rql2ListType(inner1, props1), Rql2ListType(inner2, props2)) => recurse(inner1, inner2) ++ (props2 &~ props1) - case (Rql2IterableType(_, props1), Rql2IterableType(_, props2)) => + def recurse(target: Type, source: Type): Set[SnapiTypeProperty] = (target, source) match { + case (SnapiListType(inner1, props1), SnapiListType(inner2, props2)) => + recurse(inner1, inner2) ++ (props2 &~ props1) + case (SnapiIterableType(_, props1), SnapiIterableType(_, props2)) => // inner types aren't checked because iterables aren't consumed in the moment they're passed to // the function. No exception will be raised under ProtectCast regarding an iterable's items. props2 &~ props1 - case (Rql2RecordType(atts1, props1), Rql2RecordType(atts2, props2)) => + case (SnapiRecordType(atts1, props1), SnapiRecordType(atts2, props2)) => val tipes1 = atts1.map(_.tipe) val tipes2 = atts2.map(_.tipe) assert(tipes1.size == tipes2.size) tipes1.zip(tipes2).flatMap { case (t1, t2) => recurse(t1, t2) }.toSet ++ (props2 &~ props1) - case (t1: Rql2TypeWithProperties, t2: Rql2TypeWithProperties) => t2.props &~ t1.props + case (t1: SnapiTypeWithProperties, t2: SnapiTypeWithProperties) => t2.props &~ t1.props } recurse(target, source) } @@ -204,12 +205,12 @@ class TypeMatchEntry extends EntryExtension { override def nrMandatoryParams: Int = 1 override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { - Right(ExpParam(Rql2OrType(Vector(AnythingType())))) + Right(ExpParam(SnapiOrType(Vector(AnythingType())))) } override def hasVarArgs: Boolean = true override def getVarParam(prevMandatoryArgs: Seq[Arg], prevVarArgs: Seq[Arg], idx: Int): Either[String, Param] = { - val Rql2OrType(options, _) = prevMandatoryArgs(0).t + val SnapiOrType(options, _) = prevMandatoryArgs(0).t if (idx == 0) Right(ExpParam(OneOfType(options.map(o => FunType(Vector(o), Vector.empty, AnythingType()))))) else { val FunType(_, _, outputType, _) = prevVarArgs(0).t @@ -223,7 +224,7 @@ class TypeMatchEntry extends EntryExtension { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[String, Type] = { val typesMerger = new TypesMerger - val Rql2OrType(options, _) = mandatoryArgs(0).t + val SnapiOrType(options, _) = mandatoryArgs(0).t val varTypes: Vector[Type] = varArgs.map(_.t).collect { case FunType(Vector(t), _, _, _) => t }.toVector val distincted = varTypes.groupBy(identity).mapValues(v => v.length) if (distincted.exists(_._2 >= 2)) return Left("only one handler function per type is expected") @@ -265,7 +266,7 @@ class TypeMatchEntry extends EntryExtension { // ): Either[String, Type] = { // val TypeArg(t1) = mandatoryArgs(0) // val TypeArg(t2) = mandatoryArgs(1) -// // TODO (msb): Refactor out the mergeType function of the RQL2 SemanticAnalyzer and call it from here to do the +// // TODO (msb): Refactor out the mergeType function of the Snapi SemanticAnalyzer and call it from here to do the // // type merge and return ExpType... // ??? // } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/XmlPackage.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala similarity index 83% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/XmlPackage.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala index 9414fbcbb..0bbd914ce 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/extensions/builtin/XmlPackage.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/extensions/builtin/XmlPackage.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.extensions.builtin +package com.rawlabs.snapi.frontend.snapi.extensions.builtin import com.rawlabs.compiler.{EntryDoc, ExampleDoc, PackageDoc, ParamDoc, ReturnDoc, TypeDoc} import com.rawlabs.snapi.frontend.base.errors.{ErrorCompilerMessage, InvalidSemantic, UnsupportedType} import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2._ -import com.rawlabs.snapi.frontend.rql2.extensions.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi._ +import com.rawlabs.snapi.frontend.snapi.extensions.{ Arg, EntryExtension, EntryExtensionHelper, @@ -28,7 +28,7 @@ import com.rawlabs.snapi.frontend.rql2.extensions.{ TypeParam, ValueParam } -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.snapi.frontend.inferrer.api._ class XmlPackage extends PackageExtension { @@ -87,16 +87,16 @@ class InferAndReadXmlEntry extends SugarEntryExtension with XmlEntryExtensionHel override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { assert(idx == 0) - Right(ValueParam(Rql2LocationType())) + Right(ValueParam(SnapiLocationType())) } override def optionalParams: Option[Set[String]] = Some(Set("sampleSize", "encoding", "preferNulls")) override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "sampleSize" => Right(ValueParam(Rql2IntType())) - case "encoding" => Right(ValueParam(Rql2StringType())) - case "preferNulls" => Right(ValueParam(Rql2BoolType())) + case "sampleSize" => Right(ValueParam(SnapiIntType())) + case "encoding" => Right(ValueParam(SnapiStringType())) + case "preferNulls" => Right(ValueParam(SnapiBoolType())) } } @@ -119,11 +119,11 @@ class InferAndReadXmlEntry extends SugarEntryExtension with XmlEntryExtensionHel _, XmlFormatDescriptor(dataType, sampled, _, _, _) ) = descriptor; - rql2Type = inferTypeToRql2Type(dataType, makeNullable = preferNulls && sampled, makeTryable = sampled); - okType <- validateXmlType(rql2Type) + snapiType = inferTypeToSnapiType(dataType, makeNullable = preferNulls && sampled, makeTryable = sampled); + okType <- validateXmlType(snapiType) ) yield okType match { - case Rql2IterableType(inner, _) => Rql2IterableType(inner) - case t => addProp(t, Rql2IsTryableTypeProperty()) + case SnapiIterableType(inner, _) => SnapiIterableType(inner) + case t => addProp(t, SnapiIsTryableTypeProperty()) } } @@ -189,16 +189,17 @@ trait XmlEntryExtensionHelper extends EntryExtensionHelper { } protected def validateAttributeType(t: Type): Either[Seq[UnsupportedType], Type] = t match { - case _: Rql2PrimitiveType => Right(t) - case Rql2ListType(primitive: Rql2PrimitiveType, _) => Right(Rql2ListType(primitive)) // strip the tryable/nullable - case Rql2IterableType(primitive: Rql2PrimitiveType, _) => - Right(Rql2IterableType(primitive)) // strip the tryable/nullable + case _: SnapiPrimitiveType => Right(t) + case SnapiListType(primitive: SnapiPrimitiveType, _) => + Right(SnapiListType(primitive)) // strip the tryable/nullable + case SnapiIterableType(primitive: SnapiPrimitiveType, _) => + Right(SnapiIterableType(primitive)) // strip the tryable/nullable case _ => Left(Seq(UnsupportedType(t, t, None))) } protected def validateXmlType(t: Type): Either[Seq[UnsupportedType], Type] = t match { - case _: Rql2LocationType => Left(Seq(UnsupportedType(t, t, None))) - case t: Rql2RecordType => + case _: SnapiLocationType => Left(Seq(UnsupportedType(t, t, None))) + case t: SnapiRecordType => val duplicates = t.atts.groupBy(_.idn).mapValues(_.size).collect { case (field, n) if n > 1 => field } @@ -215,12 +216,12 @@ trait XmlEntryExtensionHelper extends EntryExtensionHelper { } val errors = atts.collect { case (_, Left(error)) => error } if (errors.nonEmpty) Left(errors.flatten) - else Right(Rql2RecordType(atts.map(x => Rql2AttrType(x._1, x._2.right.get)), t.props)) + else Right(SnapiRecordType(atts.map(x => SnapiAttrType(x._1, x._2.right.get)), t.props)) } // on list and iterables we are removing the nullability/tryability - case t: Rql2IterableType => validateXmlType(t.innerType).right.map(inner => Rql2IterableType(inner)) - case t: Rql2ListType => validateXmlType(t.innerType).right.map(inner => Rql2ListType(inner)) - case Rql2OrType(options, props) => + case t: SnapiIterableType => validateXmlType(t.innerType).right.map(inner => SnapiIterableType(inner)) + case t: SnapiListType => validateXmlType(t.innerType).right.map(inner => SnapiListType(inner)) + case SnapiOrType(options, props) => // inner types may have 'tryable' or 'nullable' flags: // * tryable is removed because a tryable-whatever option would always successfully parse // as a failed whatever, and other parsers would never be tested. @@ -234,12 +235,12 @@ trait XmlEntryExtensionHelper extends EntryExtensionHelper { else { val validOptions = validation.collect { case Right(t) => t } val nullable = - options.exists { case t: Rql2TypeWithProperties => t.props.contains(Rql2IsNullableTypeProperty()) } - val finalProps = if (nullable) props + Rql2IsNullableTypeProperty() else props - Right(Rql2OrType(validOptions, finalProps)) + options.exists { case t: SnapiTypeWithProperties => t.props.contains(SnapiIsNullableTypeProperty()) } + val finalProps = if (nullable) props + SnapiIsNullableTypeProperty() else props + Right(SnapiOrType(validOptions, finalProps)) } - case t: Rql2PrimitiveType => Right(t) - case t: Rql2UndefinedType => Right(t) + case t: SnapiPrimitiveType => Right(t) + case t: SnapiUndefinedType => Right(t) case t => Left(Seq(UnsupportedType(t, t, None))) } @@ -302,7 +303,7 @@ class ReadXmlEntry extends EntryExtension with XmlEntryExtensionHelper { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2LocationType())) + case 0 => Right(ExpParam(SnapiLocationType())) case 1 => // We check valid types in return type instead, since it's easier to express there, as we do not // have a specific constraint. @@ -321,10 +322,10 @@ class ReadXmlEntry extends EntryExtension with XmlEntryExtensionHelper { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "encoding" => Right(ExpParam(Rql2StringType())) - case "timeFormat" => Right(ExpParam(Rql2StringType())) - case "dateFormat" => Right(ExpParam(Rql2StringType())) - case "timestampFormat" => Right(ExpParam(Rql2StringType())) + case "encoding" => Right(ExpParam(SnapiStringType())) + case "timeFormat" => Right(ExpParam(SnapiStringType())) + case "dateFormat" => Right(ExpParam(SnapiStringType())) + case "timestampFormat" => Right(ExpParam(SnapiStringType())) } } @@ -335,8 +336,8 @@ class ReadXmlEntry extends EntryExtension with XmlEntryExtensionHelper { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { validateXmlType(mandatoryArgs(1).t).right.map { - case Rql2IterableType(inner, _) => Rql2IterableType(inner) - case t => addProp(t, Rql2IsTryableTypeProperty()) + case SnapiIterableType(inner, _) => SnapiIterableType(inner) + case t => addProp(t, SnapiIsTryableTypeProperty()) } } @@ -415,7 +416,7 @@ class ParseXmlEntry extends EntryExtension with XmlEntryExtensionHelper { override def getMandatoryParam(prevMandatoryArgs: Seq[Arg], idx: Int): Either[String, Param] = { idx match { - case 0 => Right(ExpParam(Rql2StringType())) + case 0 => Right(ExpParam(SnapiStringType())) case 1 => // We check valid types in return type instead, since it's easier to express there, as we do not // have a specific constraint. @@ -433,9 +434,9 @@ class ParseXmlEntry extends EntryExtension with XmlEntryExtensionHelper { override def getOptionalParam(prevMandatoryArgs: Seq[Arg], idn: String): Either[String, Param] = { idn match { - case "timeFormat" => Right(ExpParam(Rql2StringType())) - case "dateFormat" => Right(ExpParam(Rql2StringType())) - case "timestampFormat" => Right(ExpParam(Rql2StringType())) + case "timeFormat" => Right(ExpParam(SnapiStringType())) + case "dateFormat" => Right(ExpParam(SnapiStringType())) + case "timestampFormat" => Right(ExpParam(SnapiStringType())) } } @@ -446,8 +447,8 @@ class ParseXmlEntry extends EntryExtension with XmlEntryExtensionHelper { varArgs: Seq[Arg] )(implicit programContext: ProgramContext): Either[Seq[ErrorCompilerMessage], Type] = { validateXmlType(mandatoryArgs(1).t).right.map { - case Rql2IterableType(inner, _) => Rql2IterableType(inner) - case t => addProp(t, Rql2IsTryableTypeProperty()) + case SnapiIterableType(inner, _) => SnapiIterableType(inner) + case t => addProp(t, SnapiIsTryableTypeProperty()) } } diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/package.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/package.scala similarity index 94% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/package.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/package.scala index 83b4c8cf3..156b36c85 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/package.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/package.scala @@ -14,10 +14,10 @@ package com.rawlabs.snapi.frontend import java.nio.file.Path -package object rql2 { +package object snapi { /** - * An interpolator for RQL code. + * An interpolator for Snapi code. */ implicit class SnapiInterpolator(val sc: StringContext) extends AnyVal { diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ImplicitCastsPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/ImplicitCastsPhase.scala similarity index 79% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ImplicitCastsPhase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/ImplicitCastsPhase.scala index a37b15d31..8c2eaa426 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ImplicitCastsPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/ImplicitCastsPhase.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.phases +package com.rawlabs.snapi.frontend.snapi.phases import com.rawlabs.snapi.frontend.base.Phase import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin._ -import com.rawlabs.snapi.frontend.rql2.{PipelinedPhase, Rql2TypeUtils, Tree} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin._ +import com.rawlabs.snapi.frontend.snapi.{PipelinedPhase, SnapiTypeUtils, Tree} import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy @@ -26,7 +26,7 @@ import org.bitbucket.inkytonik.kiama.rewriting.Strategy class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected val phaseName: String)( protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase - with Rql2TypeUtils { + with SnapiTypeUtils { override protected def execute(program: SourceProgram): SourceProgram = { implicitCast(program) @@ -39,17 +39,17 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v // Cast "e" from "actual" type to "expected". def cast(e: Exp, actual: Type, expected: Type): Option[Exp] = { if (actual == expected) None - else if (actual == Rql2UndefinedType()) Some(TypePackageBuilder.Empty(expected)) + else if (actual == SnapiUndefinedType()) Some(TypePackageBuilder.Empty(expected)) else expected match { - case r: Rql2TypeWithProperties => + case r: SnapiTypeWithProperties => val expectedProps = r.props val actualProps = getProps(actual) - if (expectedProps.contains(Rql2IsTryableTypeProperty())) { - if (actualProps.contains(Rql2IsTryableTypeProperty())) { + if (expectedProps.contains(SnapiIsTryableTypeProperty())) { + if (actualProps.contains(SnapiIsTryableTypeProperty())) { // both are tryables, cast in TryPackage.Transform val arg = IdnDef() - val a = removeProp(actual, Rql2IsTryableTypeProperty()) - val t = removeProp(expected, Rql2IsTryableTypeProperty()) + val a = removeProp(actual, SnapiIsTryableTypeProperty()) + val t = removeProp(expected, SnapiIsTryableTypeProperty()) cast(IdnExp(arg.idn), a, t).map { xCode => val mapFun = FunAbs( FunProto(Vector(FunParam(arg, Some(a), None)), Some(t), FunBody(xCode)) @@ -58,24 +58,24 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v } } else { // expected is tryable, not actual. This case is casting, say, Int to Success(Float) - cast(e, actual, removeProp(expected, Rql2IsTryableTypeProperty())) match { + cast(e, actual, removeProp(expected, SnapiIsTryableTypeProperty())) match { case Some(ne) => Some(SuccessPackageBuilder.Build(ne)) case None => Some(SuccessPackageBuilder.Build(e)) } } - } else if (actualProps.contains(Rql2IsTryableTypeProperty())) { + } else if (actualProps.contains(SnapiIsTryableTypeProperty())) { // expected isn't tryable, but actual is. We use a .get - val inner = cast(e, actual, addProp(expected, Rql2IsTryableTypeProperty())) + val inner = cast(e, actual, addProp(expected, SnapiIsTryableTypeProperty())) val inner2 = inner.getOrElse(e) Some(TryPackageBuilder.UnsafeGet(inner2)) } else { // expected isn't tryable - if (expectedProps.contains(Rql2IsNullableTypeProperty())) { - if (actualProps.contains(Rql2IsNullableTypeProperty())) { + if (expectedProps.contains(SnapiIsNullableTypeProperty())) { + if (actualProps.contains(SnapiIsNullableTypeProperty())) { // both are nullables, use Null.Transform val arg = IdnDef() - val a = removeProp(actual, Rql2IsNullableTypeProperty()) - val t = removeProp(expected, Rql2IsNullableTypeProperty()) + val a = removeProp(actual, SnapiIsNullableTypeProperty()) + val t = removeProp(expected, SnapiIsNullableTypeProperty()) cast(IdnExp(arg.idn), a, t).map { xCode => val mapFun = FunAbs( FunProto(Vector(FunParam(arg, Some(a), None)), Some(t), FunBody(xCode)) @@ -85,72 +85,72 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v } else { // expected is nullable, not actual // This case is casting, say, Int to Option(Float) - cast(e, actual, removeProp(expected, Rql2IsNullableTypeProperty())) match { + cast(e, actual, removeProp(expected, SnapiIsNullableTypeProperty())) match { case Some(ne) => Some(NullablePackageBuilder.Build(ne)) case None => Some(NullablePackageBuilder.Build(e)) } } } else { // expected isn't nullable - if (actualProps.contains(Rql2IsNullableTypeProperty())) { + if (actualProps.contains(SnapiIsNullableTypeProperty())) { // expected isn't nullable, but actual is. We stack .get on actual - val inner = cast(e, actual, addProp(expected, Rql2IsNullableTypeProperty())) + val inner = cast(e, actual, addProp(expected, SnapiIsNullableTypeProperty())) val inner2 = inner.getOrElse(e) Some(NullablePackageBuilder.UnsafeGet(inner2)) } else { // regular cast expected match { - case _: Rql2ShortType => actual match { - case _: Rql2ByteType => Some(ShortPackageBuilder.From(e)) + case _: SnapiShortType => actual match { + case _: SnapiByteType => Some(ShortPackageBuilder.From(e)) case _ => None } - case _: Rql2IntType => actual match { - case _: Rql2ByteType => Some(IntPackageBuilder.From(e)) - case _: Rql2ShortType => Some(IntPackageBuilder.From(e)) + case _: SnapiIntType => actual match { + case _: SnapiByteType => Some(IntPackageBuilder.From(e)) + case _: SnapiShortType => Some(IntPackageBuilder.From(e)) case _ => None } - case _: Rql2LongType => actual match { - case _: Rql2ByteType => Some(LongPackageBuilder.From(e)) - case _: Rql2ShortType => Some(LongPackageBuilder.From(e)) - case _: Rql2IntType => Some(LongPackageBuilder.From(e)) + case _: SnapiLongType => actual match { + case _: SnapiByteType => Some(LongPackageBuilder.From(e)) + case _: SnapiShortType => Some(LongPackageBuilder.From(e)) + case _: SnapiIntType => Some(LongPackageBuilder.From(e)) case _ => None } - case _: Rql2FloatType => actual match { - case _: Rql2ByteType => Some(FloatPackageBuilder.From(e)) - case _: Rql2ShortType => Some(FloatPackageBuilder.From(e)) - case _: Rql2IntType => Some(FloatPackageBuilder.From(e)) - case _: Rql2LongType => Some(FloatPackageBuilder.From(e)) + case _: SnapiFloatType => actual match { + case _: SnapiByteType => Some(FloatPackageBuilder.From(e)) + case _: SnapiShortType => Some(FloatPackageBuilder.From(e)) + case _: SnapiIntType => Some(FloatPackageBuilder.From(e)) + case _: SnapiLongType => Some(FloatPackageBuilder.From(e)) case _ => None } - case _: Rql2DoubleType => actual match { - case _: Rql2ByteType => Some(DoublePackageBuilder.From(e)) - case _: Rql2ShortType => Some(DoublePackageBuilder.From(e)) - case _: Rql2IntType => Some(DoublePackageBuilder.From(e)) - case _: Rql2LongType => Some(DoublePackageBuilder.From(e)) - case _: Rql2FloatType => Some(DoublePackageBuilder.From(e)) + case _: SnapiDoubleType => actual match { + case _: SnapiByteType => Some(DoublePackageBuilder.From(e)) + case _: SnapiShortType => Some(DoublePackageBuilder.From(e)) + case _: SnapiIntType => Some(DoublePackageBuilder.From(e)) + case _: SnapiLongType => Some(DoublePackageBuilder.From(e)) + case _: SnapiFloatType => Some(DoublePackageBuilder.From(e)) case _ => None } - case _: Rql2DecimalType => actual match { - case _: Rql2ByteType => Some(DecimalPackageBuilder.From(e)) - case _: Rql2ShortType => Some(DecimalPackageBuilder.From(e)) - case _: Rql2IntType => Some(DecimalPackageBuilder.From(e)) - case _: Rql2LongType => Some(DecimalPackageBuilder.From(e)) - case _: Rql2FloatType => Some(DecimalPackageBuilder.From(e)) - case _: Rql2DoubleType => Some(DecimalPackageBuilder.From(e)) + case _: SnapiDecimalType => actual match { + case _: SnapiByteType => Some(DecimalPackageBuilder.From(e)) + case _: SnapiShortType => Some(DecimalPackageBuilder.From(e)) + case _: SnapiIntType => Some(DecimalPackageBuilder.From(e)) + case _: SnapiLongType => Some(DecimalPackageBuilder.From(e)) + case _: SnapiFloatType => Some(DecimalPackageBuilder.From(e)) + case _: SnapiDoubleType => Some(DecimalPackageBuilder.From(e)) case _ => None } - case _: Rql2TimestampType => actual match { - case _: Rql2DateType => Some(TimestampPackageBuilder.FromDate(e)) + case _: SnapiTimestampType => actual match { + case _: SnapiDateType => Some(TimestampPackageBuilder.FromDate(e)) case _ => None } - case _: Rql2LocationType => actual match { - case _: Rql2StringType => Some(LocationPackageBuilder.FromString(e)) + case _: SnapiLocationType => actual match { + case _: SnapiStringType => Some(LocationPackageBuilder.FromString(e)) case _ => None } - case Rql2IterableType(t, _) => actual match { - case Rql2IterableType(Rql2UndefinedType(props), _) if props.isEmpty => + case SnapiIterableType(t, _) => actual match { + case SnapiIterableType(SnapiUndefinedType(props), _) if props.isEmpty => Some(CollectionPackageBuilder.Empty(t)) - case Rql2IterableType(a, _) => + case SnapiIterableType(a, _) => val arg = IdnDef() cast(IdnExp(arg.idn), a, t).map { xCode => val mapFun = FunAbs( @@ -159,10 +159,10 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v CollectionPackageBuilder.Transform(e, mapFun) } } - case Rql2ListType(t, _) => actual match { - case Rql2ListType(Rql2UndefinedType(props), _) if props.isEmpty => + case SnapiListType(t, _) => actual match { + case SnapiListType(SnapiUndefinedType(props), _) if props.isEmpty => Some(ListPackageBuilder.Empty(t)) - case Rql2ListType(a, _) => + case SnapiListType(a, _) => val arg = IdnDef() cast(IdnExp(arg.idn), a, t).map { xCode => val mapFun = FunAbs( @@ -171,8 +171,8 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v ListPackageBuilder.Transform(e, mapFun) } } - case Rql2RecordType(expectedFields, _) => actual match { - case Rql2RecordType(actualFields, _) => + case SnapiRecordType(expectedFields, _) => actual match { + case SnapiRecordType(actualFields, _) => assert(expectedFields.size == actualFields.size) // We'll copy the record in that variable so that its value // isn't duplicated (RD-5502) @@ -292,11 +292,11 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v val ExpType(t) = analyzer.tipe(args(1).e) t case ("List", "Build") => - val Rql2ListType(itemType, props) = analyzer.tipe(fa) + val SnapiListType(itemType, props) = analyzer.tipe(fa) assert(props.isEmpty) itemType case ("Collection", "Build") => - val Rql2IterableType(itemType, props) = analyzer.tipe(fa) + val SnapiIterableType(itemType, props) = analyzer.tipe(fa) assert(props.isEmpty) itemType case ("Collection", "Union") => analyzer.tipe(fa) @@ -362,9 +362,9 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v case LetFunRec(idn, p) => val FunType(_, _, rType, _) = analyzer.idnType(idn) handleProto(p, rType) <* rule[Any] { case nProto: FunProto => LetFunRec(idn, nProto) } - case Rql2Method(p, idn) => + case SnapiMethod(p, idn) => val FunType(_, _, rType, _) = analyzer.idnType(idn) - handleProto(p, rType) <* rule[Any] { case nProto: FunProto => Rql2Method(nProto, idn) } + handleProto(p, rType) <* rule[Any] { case nProto: FunProto => SnapiMethod(nProto, idn) } case unaryExp @ UnaryExp(op, e) => congruence(id, s) <* rule[Any] { case UnaryExp(_, re) => val t = analyzer.tipe(unaryExp) @@ -376,7 +376,7 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v case BinaryExp(_, re1, re2) => val te1 = analyzer.tipe(e1) val te2 = analyzer.tipe(e2) - val tm = Rql2BoolType(Set(Rql2IsNullableTypeProperty())) + val tm = SnapiBoolType(Set(SnapiIsNullableTypeProperty())) val ne1 = cast(re1, te1, tm).getOrElse(re1) val ne2 = cast(e2, te2, tm).getOrElse(re2) BinaryExp(op, ne1, ne2) @@ -410,7 +410,7 @@ class ImplicitCastsPhase(protected val parent: Phase[SourceProgram], protected v congruence(s, s, s) <* rule[Any] { case r @ IfThenElse(re1, re2, re3) => analyzer.mergeType(te2, te3) match { case Some(tm) => - val ne1 = cast(re1, te1, Rql2BoolType()).getOrElse(re1) + val ne1 = cast(re1, te1, SnapiBoolType()).getOrElse(re1) val ne2 = cast(re2, te2, tm).getOrElse(re2) val ne3 = cast(re3, te3, tm).getOrElse(re3) IfThenElse(ne1, ne2, ne3) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ListProjDesugarerPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/ListProjDesugarerPhase.scala similarity index 78% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ListProjDesugarerPhase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/ListProjDesugarerPhase.scala index 7e4b8fa39..99425fa66 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/ListProjDesugarerPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/ListProjDesugarerPhase.scala @@ -10,13 +10,13 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.phases +package com.rawlabs.snapi.frontend.snapi.phases import com.rawlabs.snapi.frontend.base.Phase -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{CollectionPackageBuilder, ListPackageBuilder} -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.{PipelinedPhase, Tree} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{CollectionPackageBuilder, ListPackageBuilder} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.{PipelinedPhase, Tree} import org.bitbucket.inkytonik.kiama.rewriting.Cloner.attempt import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy @@ -38,7 +38,7 @@ class ListProjDesugarerPhase(protected val parent: Phase[SourceProgram], protect case Proj(collection, i) if analyzer .tipe(collection) - .isInstanceOf[Rql2IterableType] || analyzer.tipe(collection).isInstanceOf[Rql2ListType] => + .isInstanceOf[SnapiIterableType] || analyzer.tipe(collection).isInstanceOf[SnapiListType] => congruence(s, id) <* rule[Any] { case Proj(nCollection, _) => val arg = IdnDef() @@ -46,7 +46,7 @@ class ListProjDesugarerPhase(protected val parent: Phase[SourceProgram], protect FunProto(Vector(FunParam(arg, None, None)), None, FunBody(Proj(IdnExp(arg), i))) ) - if (analyzer.tipe(collection).isInstanceOf[Rql2IterableType]) { + if (analyzer.tipe(collection).isInstanceOf[SnapiIterableType]) { CollectionPackageBuilder.Transform(nCollection, projectFun) } else { ListPackageBuilder.Transform(nCollection, projectFun) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/PropagationPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/PropagationPhase.scala similarity index 89% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/PropagationPhase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/PropagationPhase.scala index b38ce3f68..3752b56ad 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/PropagationPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/PropagationPhase.scala @@ -10,20 +10,20 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.phases +package com.rawlabs.snapi.frontend.snapi.phases import com.rawlabs.snapi.frontend.base.Phase import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.{Arg, ValueArg} -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.{Arg, ValueArg} +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ NullablePackageBuilder, NullableTryablePackageBuilder, SuccessPackageBuilder, TryPackageBuilder, TypePackageBuilder } -import com.rawlabs.snapi.frontend.rql2.{FunAppPackageEntryArguments, PipelinedPhase, Rql2TypeUtils, Rql2Value, Tree} +import com.rawlabs.snapi.frontend.snapi.{FunAppPackageEntryArguments, PipelinedPhase, SnapiTypeUtils, SnapiValue, Tree} import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy @@ -33,7 +33,7 @@ import org.bitbucket.inkytonik.kiama.rewriting.Strategy class PropagationPhase(protected val parent: Phase[SourceProgram], protected val phaseName: String)( protected val baseProgramContext: com.rawlabs.snapi.frontend.base.ProgramContext ) extends PipelinedPhase - with Rql2TypeUtils { + with SnapiTypeUtils { override protected def execute(program: SourceProgram): SourceProgram = { propagate(program) @@ -49,7 +49,7 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val entryArguments: FunAppPackageEntryArguments, args: Seq[FunAppArg], idx: Int - ): Option[Rql2Value] = { + ): Option[SnapiValue] = { val arg: Arg = args(idx).idn match { case Some(i) => entryArguments.optionalArgs.collectFirst { case a if a._1 == i => a._2 }.get case None => @@ -68,23 +68,23 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val val expType = analyzer.tipe(binExp) op match { case _: BooleanOp => - val plainType = Rql2BoolType(Set(Rql2IsNullableTypeProperty())) + val plainType = SnapiBoolType(Set(SnapiIsNullableTypeProperty())) val arguments = Vector((e1, ne1), (e2, ne2)) val argExpProps = arguments.map { case (e, ne) => val t = analyzer.tipe(e) - val extraProps = getProps(t) - Rql2IsNullableTypeProperty() + val extraProps = getProps(t) - SnapiIsNullableTypeProperty() ExpProps(ne, t, castNeeded = false, extraProps) } coreFix( plainType, argExpProps, (idns => BinaryExp(op, idns(0), idns(1))), - getProps(expType) - Rql2IsNullableTypeProperty() + getProps(expType) - SnapiIsNullableTypeProperty() ) case _ => - val operationProps: Set[Rql2TypeProperty] = op match { - case _: Div => Set(Rql2IsTryableTypeProperty()) + val operationProps: Set[SnapiTypeProperty] = op match { + case _: Div => Set(SnapiIsTryableTypeProperty()) case _ => Set.empty } // expType possibly got more flags because of the parameters. We remove @@ -102,7 +102,7 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val case unaryExp @ UnaryExp(op, e) => congruence(id, s) <* rule[Any] { case UnaryExp(_, ne) => trivialFix(unaryExp, Vector((e, ne)), idns => UnaryExp(op, idns(0)), Set.empty) } - case proj @ Proj(record, fieldName) if analyzer.tipe(record).isInstanceOf[Rql2RecordType] => + case proj @ Proj(record, fieldName) if analyzer.tipe(record).isInstanceOf[SnapiRecordType] => congruence(s, id) <* rule[Any] { case Proj(nRecord, _) => trivialFix(proj, Vector((record, nRecord)), idns => Proj(idns(0), fieldName), Set.empty) @@ -214,7 +214,7 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val originalExp: Exp, arguments: Vector[(Exp, Exp)], apply: Vector[IdnExp] => Exp, - effectiveOutputProps: Set[Rql2TypeProperty] + effectiveOutputProps: Set[SnapiTypeProperty] ): Exp = { val argExpProps = arguments.map { case (e, ne) => @@ -229,7 +229,7 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val plainType: Type, arguments: Vector[(Exp, Exp)], apply: Vector[IdnExp] => Exp, - extraProps: Set[Rql2TypeProperty] + extraProps: Set[SnapiTypeProperty] ): Exp = { val argExpProps = arguments.map { case (e, ne) => @@ -244,7 +244,7 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val rootType: Type, argExpProps: Vector[ExpProps], apply: Vector[IdnExp] => Exp, - extraProps: Set[Rql2TypeProperty] + extraProps: Set[SnapiTypeProperty] ): Exp = { val idns = argExpProps.map(_ => IdnDef()) val boxedBody = { @@ -258,22 +258,22 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val if (outProps.isEmpty) { // the operation isn't nullable/tryable. Wrap it with the needed nodes to match. val withNullWrapping = - if (effectiveOutputProps.contains(Rql2IsNullableTypeProperty())) NullablePackageBuilder.Build(root) + if (effectiveOutputProps.contains(SnapiIsNullableTypeProperty())) NullablePackageBuilder.Build(root) else root val withTryWrapping = - if (effectiveOutputProps.contains(Rql2IsTryableTypeProperty())) + if (effectiveOutputProps.contains(SnapiIsTryableTypeProperty())) SuccessPackageBuilder.Build(withNullWrapping) else withNullWrapping withTryWrapping - } else if (outProps == Set(Rql2IsNullableTypeProperty())) { + } else if (outProps == Set(SnapiIsNullableTypeProperty())) { // e.g. nullable and/or called with errors assert( - effectiveOutputProps.contains(Rql2IsTryableTypeProperty()) + effectiveOutputProps.contains(SnapiIsTryableTypeProperty()) ) // otherwise it should have been equal above SuccessPackageBuilder.Build(root) - } else if (outProps == Set(Rql2IsTryableTypeProperty())) { + } else if (outProps == Set(SnapiIsTryableTypeProperty())) { // e.g. division. - if (outProps.contains(Rql2IsNullableTypeProperty())) { + if (outProps.contains(SnapiIsNullableTypeProperty())) { // special case: the operation is a plain tryable one, but needs to be computed as a nullable too. // We cannot box it in a nullable.build since it would be a null(try) instead of try(null). We // compute the operation (as a try) and box its results as a nullable with Transform. @@ -302,7 +302,7 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val val funParam = FunParam(idn, Some(innerType), None) // if the map/flatmap is applied to a 'undefined', the function won't be executed. We replace the // body by an unspecified zero of the body type. - val nextBody = if (innerType == Rql2UndefinedType()) TypePackageBuilder.Empty(outputType) else body + val nextBody = if (innerType == SnapiUndefinedType()) TypePackageBuilder.Empty(outputType) else body val fun = FunAbs( FunProto( Vector(funParam), @@ -336,12 +336,12 @@ class PropagationPhase(protected val parent: Phase[SourceProgram], protected val } -private case class TypeAndValue(t: Type, value: Option[Rql2Value]) +private case class TypeAndValue(t: Type, value: Option[SnapiValue]) private case class ExpProps( ne: Exp, t: Type, castNeeded: Boolean, - props: Set[Rql2TypeProperty], - value: Option[Rql2Value] = None + props: Set[SnapiTypeProperty], + value: Option[SnapiValue] = None ) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/SugarExtensionDesugarerPhase.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/SugarExtensionDesugarerPhase.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/SugarExtensionDesugarerPhase.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/SugarExtensionDesugarerPhase.scala index b4292840f..0430ddb86 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/phases/SugarExtensionDesugarerPhase.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/phases/SugarExtensionDesugarerPhase.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.phases +package com.rawlabs.snapi.frontend.snapi.phases import com.rawlabs.snapi.frontend.base.Phase import com.rawlabs.snapi.frontend.base.errors.ErrorCompilerMessage import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.source._ -import com.rawlabs.snapi.frontend.rql2.extensions.SugarEntryExtension -import com.rawlabs.snapi.frontend.rql2.{FunAppPackageEntryArguments, PipelinedPhase, Tree} +import com.rawlabs.snapi.frontend.snapi.source._ +import com.rawlabs.snapi.frontend.snapi.extensions.SugarEntryExtension +import com.rawlabs.snapi.frontend.snapi.{FunAppPackageEntryArguments, PipelinedPhase, Tree} import org.bitbucket.inkytonik.kiama.rewriting.Rewriter._ import org.bitbucket.inkytonik.kiama.rewriting.Strategy diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceCommentsPrettyPrinter.scala similarity index 91% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceCommentsPrettyPrinter.scala index a5d5e2c38..136b484b2 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourceCommentsPrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceCommentsPrettyPrinter.scala @@ -10,14 +10,14 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.source +package com.rawlabs.snapi.frontend.snapi.source import org.bitbucket.inkytonik.kiama.output.{LeftAssoc, NonAssoc, PrettyExpression, RightAssoc} import org.bitbucket.inkytonik.kiama.util.Trampolines.Done import org.bitbucket.inkytonik.kiama.util.{Position, Positions, StringSource} import com.rawlabs.snapi.frontend.base.source.BaseNode -import com.rawlabs.snapi.frontend.rql2.antlr4.{CommentsAntlrSyntaxAnalyzer, NodeComments} -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.snapi.antlr4.{CommentsAntlrSyntaxAnalyzer, NodeComments} +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} import java.util import scala.collection.JavaConverters._ @@ -110,24 +110,24 @@ class SourceCommentsPrettyPrinter(maybeIndent: Option[Int] = None, maybeWidth: O s } - override def rql2Node(n: Rql2Node): Doc = n match { - case Rql2Program(methods, me) => + override def snapiNode(n: SnapiNode): Doc = n match { + case SnapiProgram(methods, me) => // adding double line break between methods - val methodsDoc = methods.map { case m @ Rql2Method(p, idn) => withComments(m, idn <> funProto(p)) <> linebreak } + val methodsDoc = methods.map { case m @ SnapiMethod(p, idn) => withComments(m, idn <> funProto(p)) <> linebreak } ssep(methodsDoc ++ me.toSeq.map(toDoc), line) - case _ => super.rql2Node(n) + case _ => super.snapiNode(n) } - override def rql2TypeWithProperties(t: Rql2TypeWithProperties): Doc = t match { + override def snapiTypeWithProperties(t: SnapiTypeWithProperties): Doc = t match { case FunType(ms, os, r, props) => val args = ms.map(x => (x, super.toDoc(x))) ++ os.map(o => (o, o.i <> ":" <+> super.toDoc(o.t))) val d = parens(listWComments(args)) <+> "->" <+> r d - case _ => super.rql2TypeWithProperties(t) + case _ => super.snapiTypeWithProperties(t) } - override def rql2Exp(e: Rql2Exp): Doc = e match { + override def snapiExp(e: SnapiExp): Doc = e match { case Let(stmts, e) => val stmtDoc = lFoldWComment(stmts.map(x => (x, super.toDoc(x))), comma) "let" <> nest(line <> stmtDoc) <> line <> "in" <> nest(line <> e) @@ -151,7 +151,7 @@ class SourceCommentsPrettyPrinter(maybeIndent: Option[Int] = None, maybeWidth: O } case f: FunAbs => funProtoWComments(f.p, "->") - case _ => super.rql2Exp(e) + case _ => super.snapiExp(e) } override def funAppArg(a: FunAppArg): Doc = withComments(a, super.funAppArg(a)) diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourcePrettyPrinter.scala similarity index 77% rename from snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala rename to snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourcePrettyPrinter.scala index 8cfc05695..a08ed0628 100644 --- a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/rql2/source/SourcePrettyPrinter.scala +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourcePrettyPrinter.scala @@ -10,21 +10,21 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2.source +package com.rawlabs.snapi.frontend.snapi.source import com.rawlabs.utils.core.RawUtils import org.bitbucket.inkytonik.kiama.output._ import com.rawlabs.snapi.frontend.base import com.rawlabs.snapi.frontend.base.source.{AnythingType, BaseNode, Type} -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} -import com.rawlabs.snapi.frontend.rql2.{Keywords, Rql2TypeUtils} +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.{ListPackageBuilder, RecordPackageBuilder} +import com.rawlabs.snapi.frontend.snapi.{Keywords, SnapiTypeUtils} import scala.collection.mutable trait SourcePrettyPrinter extends base.source.SourcePrettyPrinter with Keywords - with Rql2TypeUtils + with SnapiTypeUtils with ParenPrettyPrinter { protected def args(n: Vector[SourceNode]): Doc = sepArgs(comma, n.map(toDoc): _*) @@ -36,18 +36,18 @@ trait SourcePrettyPrinter protected def internal: Boolean = false - protected def rql2Type(t: Rql2Type): Doc = t match { - case t: Rql2TypeConstraint => rql2TypeConstraints(t) - case t: Rql2TypeWithProperties => rql2TypeWithProperties(t) + protected def snapiType(t: SnapiType): Doc = t match { + case t: SnapiTypeConstraint => snapiTypeConstraints(t) + case t: SnapiTypeWithProperties => snapiTypeWithProperties(t) case TypeAliasType(idn) => idn case ExpType(t) => "type" <+> t case PackageType(name) => method("package", s""""$name"""") case PackageEntryType(pkgName, entName) => method("package", s""""$pkgName"""", s""""$entName"""") } - protected def rql2TypeWithProperties(t: Rql2TypeWithProperties): Doc = { + protected def snapiTypeWithProperties(t: SnapiTypeWithProperties): Doc = { val d: Doc = t match { - case Rql2OrType(ts, props) => + case SnapiOrType(ts, props) => val d = folddoc(ts.map(toDoc), _ <+> "or" <+> _) if (internal) { // Wrap in parenthesis to disambiguate the type property annotations. @@ -67,36 +67,36 @@ trait SourcePrettyPrinter d } case other => other match { - case _: Rql2BoolType => "bool" - case _: Rql2StringType => "string" - case _: Rql2LocationType => "location" - case _: Rql2BinaryType => "binary" - case _: Rql2ByteType => "byte" - case _: Rql2ShortType => "short" - case _: Rql2IntType => "int" - case _: Rql2LongType => "long" - case _: Rql2FloatType => "float" - case _: Rql2DoubleType => "double" - case _: Rql2DecimalType => "decimal" - case _: Rql2DateType => "date" - case _: Rql2TimeType => "time" - case _: Rql2IntervalType => "interval" - case _: Rql2TimestampType => "timestamp" - case Rql2RecordType(atts, _) => method("record", atts.map(att => ident(att.idn) <> ":" <+> att.tipe): _*) - case Rql2IterableType(innerType, _) => innerType match { + case _: SnapiBoolType => "bool" + case _: SnapiStringType => "string" + case _: SnapiLocationType => "location" + case _: SnapiBinaryType => "binary" + case _: SnapiByteType => "byte" + case _: SnapiShortType => "short" + case _: SnapiIntType => "int" + case _: SnapiLongType => "long" + case _: SnapiFloatType => "float" + case _: SnapiDoubleType => "double" + case _: SnapiDecimalType => "decimal" + case _: SnapiDateType => "date" + case _: SnapiTimeType => "time" + case _: SnapiIntervalType => "interval" + case _: SnapiTimestampType => "timestamp" + case SnapiRecordType(atts, _) => method("record", atts.map(att => ident(att.idn) <> ":" <+> att.tipe): _*) + case SnapiIterableType(innerType, _) => innerType match { case _: AnythingType => "collection" case _ => method("collection", innerType) } - case Rql2ListType(innerType, _) => innerType match { + case SnapiListType(innerType, _) => innerType match { case _: AnythingType => "list" case _ => method("list", innerType) } - case _: Rql2UndefinedType => "undefined" + case _: SnapiUndefinedType => "undefined" } } if (internal) { - val isNullable = t.props.contains(Rql2IsNullableTypeProperty()) - val isTryable = t.props.contains(Rql2IsTryableTypeProperty()) + val isNullable = t.props.contains(SnapiIsNullableTypeProperty()) + val isTryable = t.props.contains(SnapiIsTryableTypeProperty()) if (!isTryable && !isNullable) d else { val props: Doc = @@ -111,15 +111,15 @@ trait SourcePrettyPrinter } - private def rql2TypeConstraints(t: Rql2TypeConstraint): Doc = t match { + private def snapiTypeConstraints(t: SnapiTypeConstraint): Doc = t match { case MergeableType(t) => "compatible" <+> "with" <+> t case ExpectedProjType(i) => "package" <> "," <+> "record" <> "," <+> "collection" <+> "or" <+> "list" <+> "with" <+> "field" <+> i case IsNullable() => "type nullable" case IsTryable() => "type tryable" case HasTypeProperties(props) => - val isNullable = props.contains(Rql2IsNullableTypeProperty()) - val isTryable = props.contains(Rql2IsTryableTypeProperty()) + val isNullable = props.contains(SnapiIsNullableTypeProperty()) + val isTryable = props.contains(SnapiIsTryableTypeProperty()) if (isNullable && isTryable) { "type nullable and tryable" } else if (isNullable) { @@ -131,8 +131,8 @@ trait SourcePrettyPrinter } case DoesNotHaveTypeProperties(props) => // We are doing the "DoesNotHave" type constraints. - val isNotNullable = props.contains(Rql2IsNullableTypeProperty()) - val isNotTryable = props.contains(Rql2IsTryableTypeProperty()) + val isNotNullable = props.contains(SnapiIsNullableTypeProperty()) + val isNotTryable = props.contains(SnapiIsTryableTypeProperty()) if (isNotNullable && isNotTryable) { "type not nullable and not tryable" } else if (isNotNullable) { @@ -144,7 +144,7 @@ trait SourcePrettyPrinter } } - protected def rql2Exp(e: Rql2Exp): Doc = e match { + protected def snapiExp(e: SnapiExp): Doc = e match { case Let(stmts, e) => "let" <> nest(line <> ssep(stmts.map(toDoc), comma <> line)) <> line <> "in" <> nest(line <> e) case TypeExp(t) => "type" <+> t @@ -206,7 +206,7 @@ trait SourcePrettyPrinter } } - protected def rql2LetDecl(d: LetDecl): Doc = d match { + protected def snapiLetDecl(d: LetDecl): Doc = d match { case LetBind(e, i, mt) => mt match { case Some(t) => i <> ":" <+> t <+> "=" <+> e case None => i <+> "=" <+> e @@ -224,22 +224,22 @@ trait SourcePrettyPrinter } } - protected def rql2Node(n: Rql2Node): Doc = n match { - case e: Rql2Exp => rql2Exp(e) - case t: Rql2Type => rql2Type(t) - case Rql2Program(methods, me) => - val methodsDoc = methods.map { case Rql2Method(p, idn) => idn <> funProto(p) } + protected def snapiNode(n: SnapiNode): Doc = n match { + case e: SnapiExp => snapiExp(e) + case t: SnapiType => snapiType(t) + case SnapiProgram(methods, me) => + val methodsDoc = methods.map { case SnapiMethod(p, idn) => idn <> funProto(p) } ssep(methodsDoc ++ me.toSeq.map(toDoc), line) - case l: LetDecl => rql2LetDecl(l) + case l: LetDecl => snapiLetDecl(l) } - private val integer: Set[Type] = Set(Rql2ByteType(), Rql2ShortType(), Rql2IntType(), Rql2LongType()) - private val number: Set[Type] = integer ++ Set(Rql2FloatType(), Rql2DoubleType(), Rql2DecimalType()) - private val temporal: Set[Type] = Set(Rql2DateType(), Rql2TimeType(), Rql2TimestampType(), Rql2IntervalType()) + private val integer: Set[Type] = Set(SnapiByteType(), SnapiShortType(), SnapiIntType(), SnapiLongType()) + private val number: Set[Type] = integer ++ Set(SnapiFloatType(), SnapiDoubleType(), SnapiDecimalType()) + private val temporal: Set[Type] = Set(SnapiDateType(), SnapiTimeType(), SnapiTimestampType(), SnapiIntervalType()) override def toDoc(n: BaseNode): Doc = n match { case n: CommonNode => commonNode(n) - case n: Rql2Node => rql2Node(n) + case n: SnapiNode => snapiNode(n) case _ => super.toDoc(n) } @@ -282,7 +282,7 @@ trait SourcePrettyPrinter case OneOfType(ts) => val info = mutable.ArrayBuffer[Doc]() val cleanTs: mutable.HashSet[Type] = - ts.map(t => removeProps(t, Set(Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty()))).to + ts.map(t => removeProps(t, Set(SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty()))).to if (number.subsetOf(cleanTs)) { number.foreach(cleanTs.remove) info += "number" diff --git a/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceTree.scala b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceTree.scala new file mode 100644 index 000000000..481a6aa6f --- /dev/null +++ b/snapi-frontend/src/main/scala/com/rawlabs/snapi/frontend/snapi/source/SourceTree.scala @@ -0,0 +1,559 @@ +/* + * Copyright 2023 RAW Labs S.A. + * + * Use of this software is governed by the Business Source License + * included in the file licenses/BSL.txt. + * + * As of the Change Date specified in that file, in accordance with + * the Business Source License, use of this software will be governed + * by the Apache License, Version 2.0, included in the file + * licenses/APL.txt. + */ + +package com.rawlabs.snapi.frontend.snapi.source + +import org.bitbucket.inkytonik.kiama.output._ +import org.bitbucket.inkytonik.kiama.output.PrettyExpression +import com.rawlabs.snapi.frontend.base.source.Type +import com.rawlabs.snapi.frontend.base.Counter +import com.rawlabs.snapi.frontend.base.source._ + +trait SourceNode extends BaseNode + +object SourceTree { + import org.bitbucket.inkytonik.kiama.relation.Tree + + type SourceTree = Tree[SourceNode, SourceProgram] +} + +/** + * Top-level source node. + */ +trait SourceProgram extends SourceNode with BaseProgram { + def params: Vector[SourceProgramParam] + def comment: Option[String] = None +} + +final case class SourceProgramParam(idn: CommonIdnNode, t: Type) extends CommonNode + +/** + * Qualifiers + */ +// TODO (msb): These are best called "Statements" because that's (also?) what they are +// Qual is more general than Stmt: a Gen is a Qual but not a Stmt while Bind is +trait Qual extends SourceNode + +/** + * Declarations + */ +trait Decl extends SourceNode with Qual + +/** + * Expressions + */ +trait Exp extends SourceNode with Qual with PrettyExpression + +/** + * * From now on are "common language"-related nodes. ** + */ + +/** + * Parent of all "common language" nodes. + */ +trait CommonNode extends SourceNode + +/** + * Parent of all "common language" types. + */ +trait CommonType extends Type with CommonNode + +/** + * Any Type + * The top type. + */ +final case class AnyType() extends CommonType + +/** + * Nothing Type + * The bottom type. + */ +final case class NothingType() extends CommonType + +/** + * This type is used when the tree has errors. + */ +final case class ErrorType() extends CommonType + +/** + * Parent of all "common language" expressions. + */ +trait CommonExp extends Exp with CommonNode + +/////////////////////////////////////////////////////////////////////////// +// Type Constraints +/////////////////////////////////////////////////////////////////////////// + +trait CommonTypeConstraint extends CommonType + +/** + * One-of Type constraint. + */ +final case class OneOfType(tipes: Vector[Type]) extends CommonTypeConstraint + +object OneOfType { + def apply(tipes: Type*): OneOfType = { + OneOfType(tipes.toVector) + } +} + +final case class ExpectedRecordType(idns: Set[String]) extends CommonTypeConstraint + +/////////////////////////////////////////////////////////////////////////// +// Identifiers +/////////////////////////////////////////////////////////////////////////// + +abstract class CommonIdnNode extends BaseIdnNode with CommonNode + +/** + * Defining occurrence of an identifier + */ +final case class IdnDef(idn: String) extends CommonIdnNode + +object IdnDef { + def apply(): IdnDef = IdnDef(Counter.next("common")) +} + +/** + * Use of an identifier + */ +final case class IdnUse(idn: String) extends CommonIdnNode + +object IdnUse { + def apply(i: IdnDef): IdnUse = IdnUse(i.idn) +} + +/** + * Identifier expression + */ +final case class IdnExp(idn: IdnUse) extends CommonExp + +object IdnExp { + def apply(i: IdnDef): IdnExp = IdnExp(IdnUse(i.idn)) + def apply(i: String): IdnExp = IdnExp(IdnUse(i)) + def apply(p: SourceProgramParam): IdnExp = IdnExp(p.idn.idn) + def apply(p: BaseIdnNode): IdnExp = IdnExp(p.idn) +} + +/////////////////////////////////////////////////////////////////////////// +// Expressions +/////////////////////////////////////////////////////////////////////////// + +final case class ErrorExp() extends CommonExp + +/////////////////////////////////////////////////////////////////////////// +// Snapi +/////////////////////////////////////////////////////////////////////////// + +sealed trait SnapiNode extends SourceNode + +/////////////////////////////////////////////////////////////////////////// +// Program +/////////////////////////////////////////////////////////////////////////// + +final case class SnapiProgram(methods: Vector[SnapiMethod], me: Option[Exp]) extends SnapiNode with SourceProgram { + override val params: Vector[SourceProgramParam] = Vector.empty +} + +object SnapiProgram { + def apply(e: Exp): SnapiProgram = SnapiProgram(Vector.empty, Some(e)) +} + +final case class SnapiMethod(p: FunProto, i: IdnDef) extends SnapiNode + +/////////////////////////////////////////////////////////////////////////// +// Types +/////////////////////////////////////////////////////////////////////////// + +sealed trait SnapiType extends Type with SnapiNode + +sealed trait SnapiTypeProperty extends SnapiNode +final case class SnapiIsNullableTypeProperty() extends SnapiTypeProperty +final case class SnapiIsTryableTypeProperty() extends SnapiTypeProperty + +/** + * A subset of Snapi types have type properties. + */ +sealed trait SnapiTypeWithProperties extends SnapiType { + def props: Set[SnapiTypeProperty] + def cloneAndAddProp(p: SnapiTypeProperty): Type + def cloneAndRemoveProp(p: SnapiTypeProperty): Type +} + +final case class SnapiUndefinedType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiTypeWithProperties { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiUndefinedType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiUndefinedType(props - p) +} + +/** + * Primitive types + */ +sealed trait SnapiPrimitiveType extends SnapiTypeWithProperties + +final case class SnapiBoolType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiPrimitiveType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiBoolType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiBoolType(props - p) +} + +final case class SnapiStringType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiPrimitiveType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiStringType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiStringType(props - p) +} + +final case class SnapiLocationType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiPrimitiveType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiLocationType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiLocationType(props - p) +} + +final case class SnapiBinaryType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiPrimitiveType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiBinaryType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiBinaryType(props - p) +} + +/** + * Number types + * + * These are also primitive types. + */ +sealed trait SnapiNumberType extends SnapiPrimitiveType + +sealed trait SnapiIntegralNumberType extends SnapiNumberType + +final case class SnapiByteType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiIntegralNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiByteType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiByteType(props - p) +} + +final case class SnapiShortType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiIntegralNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiShortType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiShortType(props - p) +} + +final case class SnapiIntType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiIntegralNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiIntType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiIntType(props - p) +} + +final case class SnapiLongType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiIntegralNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiLongType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiLongType(props - p) +} + +final case class SnapiFloatType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiFloatType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiFloatType(props - p) +} + +final case class SnapiDoubleType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiDoubleType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiDoubleType(props - p) +} + +final case class SnapiDecimalType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiNumberType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiDecimalType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiDecimalType(props - p) +} + +/** + * Temporal types + * + * These are also primitive types. + */ +sealed trait SnapiTemporalType extends SnapiPrimitiveType + +final case class SnapiDateType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiTemporalType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiDateType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiDateType(props - p) +} + +final case class SnapiTimeType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiTemporalType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiTimeType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiTimeType(props - p) +} + +final case class SnapiTimestampType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiTemporalType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiTimestampType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiTimestampType(props - p) +} + +final case class SnapiIntervalType(props: Set[SnapiTypeProperty] = Set.empty) extends SnapiTemporalType { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiIntervalType(props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiIntervalType(props - p) +} + +/** + * Record Type + */ +final case class SnapiRecordType(atts: Vector[SnapiAttrType], props: Set[SnapiTypeProperty] = Set.empty) + extends SnapiTypeWithProperties { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiRecordType(atts, props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiRecordType(atts, props - p) +} +final case class SnapiAttrType(idn: String, tipe: Type) extends SnapiNode + +/** + * Iterable Type + */ +final case class SnapiIterableType(innerType: Type, props: Set[SnapiTypeProperty] = Set.empty) + extends SnapiTypeWithProperties { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiIterableType(innerType, props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiIterableType(innerType, props - p) +} + +/** + * List Type + * + * Inherits from IterableType but provides index operations. + */ +final case class SnapiListType(innerType: Type, props: Set[SnapiTypeProperty] = Set.empty) + extends SnapiTypeWithProperties { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiListType(innerType, props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiListType(innerType, props - p) +} + +/** + * Function Type. + */ +final case class FunType( + ms: Vector[Type], + os: Vector[FunOptTypeParam], + r: Type, + props: Set[SnapiTypeProperty] = Set.empty +) extends SnapiTypeWithProperties { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = FunType(ms, os, r, props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = FunType(ms, os, r, props - p) +} +final case class FunOptTypeParam(i: String, t: Type) extends SnapiNode + +/** + * Or Type. + */ +final case class SnapiOrType(tipes: Vector[Type], props: Set[SnapiTypeProperty] = Set.empty) + extends SnapiTypeWithProperties { + override def cloneAndAddProp(p: SnapiTypeProperty): Type = SnapiOrType(tipes, props + p) + override def cloneAndRemoveProp(p: SnapiTypeProperty): Type = SnapiOrType(tipes, props - p) +} + +object SnapiOrType { + def apply(t1: Type, t2: Type, props: Set[SnapiTypeProperty]): SnapiOrType = { + (t1, t2) match { + case (SnapiOrType(tipes1, props1), SnapiOrType(tipes2, props2)) if props == props1 && props == props2 => + SnapiOrType(tipes1 ++ tipes2, props) + case (SnapiOrType(tipes1, props1), _) if props == props1 => SnapiOrType(tipes1 :+ t2, props) + case (_, SnapiOrType(tipes2, props2)) if props == props2 => SnapiOrType(Vector(t1) ++ tipes2, props) + case _ => SnapiOrType(Vector(t1, t2), props) + } + } +} + +/** + * Package Type. + */ +final case class PackageType(name: String) extends SnapiType +final case class PackageEntryType(pkgName: String, entName: String) extends SnapiType + +/** + * Type Alias. + */ +final case class TypeAliasType(idn: IdnUse) extends SnapiType + +/** + * Expression Type. + * + * The type of an expression such as `type int`. + */ +final case class ExpType(t: Type) extends SnapiType + +/////////////////////////////////////////////////////////////////////////// +// Type Constraints +/////////////////////////////////////////////////////////////////////////// + +sealed trait SnapiTypeConstraint extends SnapiType + +final case class ExpectedProjType(i: String) extends SnapiTypeConstraint + +final case class MergeableType(t: Type) extends SnapiTypeConstraint + +final case class HasTypeProperties(props: Set[SnapiTypeProperty]) extends SnapiTypeConstraint + +final case class IsTryable() extends SnapiTypeConstraint + +final case class IsNullable() extends SnapiTypeConstraint + +final case class DoesNotHaveTypeProperties(props: Set[SnapiTypeProperty]) extends SnapiTypeConstraint + +/////////////////////////////////////////////////////////////////////////// +// Expressions +/////////////////////////////////////////////////////////////////////////// + +sealed trait SnapiExp extends Exp with SnapiNode + +/** + * Constants + */ + +trait Const extends SnapiExp + +final case class NullConst() extends Const + +final case class BoolConst(value: Boolean) extends Const + +final case class StringConst(value: String) extends Const + +final case class TripleQuotedStringConst(value: String) extends Const + +final case class BinaryConst(bytes: Array[Byte]) extends Const { + override def equals(obj: Any): Boolean = { + obj match { + case BinaryConst(otherBytes) => bytes.sameElements(otherBytes) + case _ => false + } + } +} + +final case class LocationConst(bytes: Array[Byte], publicDescription: String) extends Const + +/** + * Number Constants + */ +trait NumberConst extends Const + +final case class ByteConst(value: String) extends NumberConst + +final case class ShortConst(value: String) extends NumberConst + +final case class IntConst(value: String) extends NumberConst + +final case class LongConst(value: String) extends NumberConst + +final case class FloatConst(value: String) extends NumberConst + +final case class DoubleConst(value: String) extends NumberConst + +final case class DecimalConst(value: String) extends NumberConst + +/** + * Type Expression + */ +final case class TypeExp(t: Type) extends SnapiExp + +/** + * Let + */ + +final case class Let(decls: Vector[LetDecl], e: Exp) extends SnapiExp + +sealed abstract class LetDecl extends SnapiNode +final case class LetBind(e: Exp, i: IdnDef, t: Option[Type]) extends LetDecl +final case class LetFun(p: FunProto, i: IdnDef) extends LetDecl +final case class LetFunRec(i: IdnDef, p: FunProto) extends LetDecl + +final case class FunProto(ps: Vector[FunParam], r: Option[Type], b: FunBody) extends SnapiNode + +final case class FunParam(i: IdnDef, t: Option[Type], e: Option[Exp]) extends SnapiNode + +// Body of function (defined as a separate node to have a separate scope). +final case class FunBody(e: Exp) extends SnapiNode + +/** + * Function Abstraction + */ + +final case class FunAbs(p: FunProto) extends SnapiExp + +/** + * Function Application + */ + +final case class FunApp(f: Exp, args: Vector[FunAppArg]) extends SnapiExp + +final case class FunAppArg(e: Exp, idn: Option[String]) extends SnapiNode + +/** + * Projection + */ + +final case class Proj(e: Exp, i: String) extends SnapiExp + +/** + * Unary Operators + */ + +final case class UnaryExp(unaryOp: UnaryOp, exp: Exp) extends SnapiExp with PrettyUnaryExpression { + override def op: String = unaryOp.op + override def priority: Int = unaryOp.priority + override def fixity: Fixity = unaryOp.fixity +} + +sealed abstract class UnaryOp(val op: String, val priority: Int) extends SnapiNode { + def fixity = Prefix +} + +final case class Not() extends UnaryOp("not", 2) + +final case class Neg() extends UnaryOp("-", 2) + +/** + * Binary Operators + */ +final case class BinaryExp(binaryOp: BinaryOp, left: Exp, right: Exp) extends SnapiExp with PrettyBinaryExpression { + override def op: String = binaryOp.op + override def priority: Int = binaryOp.priority + override def fixity: Fixity = binaryOp.fixity +} + +sealed abstract class BinaryOp(val op: String, val priority: Int) extends SnapiNode { + def fixity = Infix(LeftAssoc) +} + +final case class Plus() extends BinaryOp("+", 5) + +final case class Sub() extends BinaryOp("-", 5) + +final case class Mult() extends BinaryOp("*", 4) + +final case class Div() extends BinaryOp("/", 4) + +final case class Mod() extends BinaryOp("%", 4) + +sealed abstract class ComparableOp(op: String, priority: Int) extends BinaryOp(op, priority) + +final case class Ge() extends ComparableOp(">=", 7) + +final case class Gt() extends ComparableOp(">", 7) + +final case class Le() extends ComparableOp("<=", 7) + +final case class Lt() extends ComparableOp("<", 7) + +final case class Eq() extends ComparableOp("==", 8) + +final case class Neq() extends ComparableOp("!=", 8) + +sealed abstract class BooleanOp(op: String, priority: Int) extends BinaryOp(op, priority) + +final case class And() extends BooleanOp("and", 12) + +final case class Or() extends BooleanOp("or", 13) + +/** + * Tertiary Operators + */ + +final case class IfThenElse(e1: Exp, e2: Exp, e3: Exp) extends SnapiExp + +/** + * PackageIdnExp + * + * Used to refer to built-in package names. + */ +final case class PackageIdnExp(name: String) extends SnapiExp diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala index 80a894fb5..5b0960196 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4LspTests.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source.{ErrorType, IdnDef, IdnExp, IdnUse} -import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source.{ErrorType, IdnDef, IdnExp, IdnUse} +import com.rawlabs.snapi.frontend.snapi.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.utils.core.RawTestSuite class Antlr4LspTests extends RawTestSuite { @@ -88,13 +88,13 @@ class Antlr4LspTests extends RawTestSuite { val result = parseWithAntlr4(prog) assert(result.hasErrors) assert( - result.tree == Rql2Program( + result.tree == SnapiProgram( Vector(), Some( Let( Vector( LetBind( - TypeExp(Rql2IntType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + TypeExp(SnapiIntType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))), IdnDef("b"), None ), @@ -112,13 +112,13 @@ class Antlr4LspTests extends RawTestSuite { val result = parseWithAntlr4(prog) assert(result.hasErrors) assert( - result.tree == Rql2Program( + result.tree == SnapiProgram( Vector(), Some( Let( Vector( LetBind( - TypeExp(Rql2IntType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + TypeExp(SnapiIntType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))), IdnDef("b"), None ), diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala index 97fccfae0..d4e3d34f7 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/Antlr4TypeTests.scala @@ -10,16 +10,17 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.rawlabs.snapi.frontend.base.source.Type -import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.utils.core.RawTestSuite class Antlr4TypeTests extends RawTestSuite { - def props: Set[Rql2TypeProperty] = Set[Rql2TypeProperty](Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty()) + def props: Set[SnapiTypeProperty] = + Set[SnapiTypeProperty](SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty()) def parseType(s: String): Type = { val positions = new org.bitbucket.inkytonik.kiama.util.Positions @@ -28,48 +29,48 @@ class Antlr4TypeTests extends RawTestSuite { } // Single types - test("""int type""")(_ => assert(parseType("int") == Rql2IntType(props))) + test("""int type""")(_ => assert(parseType("int") == SnapiIntType(props))) test("""Record""") { _ => assert( parseType( "record(a: byte, b: short, c: int, e: long, f: float, g: double, h: decimal, i: bool, j: string, k: undefined)" - ) == Rql2RecordType( + ) == SnapiRecordType( Vector( - Rql2AttrType("a", Rql2ByteType(props)), - Rql2AttrType("b", Rql2ShortType(props)), - Rql2AttrType("c", Rql2IntType(props)), - Rql2AttrType("e", Rql2LongType(props)), - Rql2AttrType("f", Rql2FloatType(props)), - Rql2AttrType("g", Rql2DoubleType(props)), - Rql2AttrType("h", Rql2DecimalType(props)), - Rql2AttrType("i", Rql2BoolType(props)), - Rql2AttrType("j", Rql2StringType(props)), - Rql2AttrType("k", Rql2UndefinedType(props)) + SnapiAttrType("a", SnapiByteType(props)), + SnapiAttrType("b", SnapiShortType(props)), + SnapiAttrType("c", SnapiIntType(props)), + SnapiAttrType("e", SnapiLongType(props)), + SnapiAttrType("f", SnapiFloatType(props)), + SnapiAttrType("g", SnapiDoubleType(props)), + SnapiAttrType("h", SnapiDecimalType(props)), + SnapiAttrType("i", SnapiBoolType(props)), + SnapiAttrType("j", SnapiStringType(props)), + SnapiAttrType("k", SnapiUndefinedType(props)) ), props ) ) - assert(parseType("record()") == Rql2RecordType(Vector.empty, props)) + assert(parseType("record()") == SnapiRecordType(Vector.empty, props)) } test("""Collection of records""") { _ => assert( parseType( "collection(record(a: byte, b: short, c: int, e: long, f: float, g: double, h: decimal, i: bool, j: string, k: undefined))" - ) == Rql2IterableType( - Rql2RecordType( + ) == SnapiIterableType( + SnapiRecordType( Vector( - Rql2AttrType("a", Rql2ByteType(props)), - Rql2AttrType("b", Rql2ShortType(props)), - Rql2AttrType("c", Rql2IntType(props)), - Rql2AttrType("e", Rql2LongType(props)), - Rql2AttrType("f", Rql2FloatType(props)), - Rql2AttrType("g", Rql2DoubleType(props)), - Rql2AttrType("h", Rql2DecimalType(props)), - Rql2AttrType("i", Rql2BoolType(props)), - Rql2AttrType("j", Rql2StringType(props)), - Rql2AttrType("k", Rql2UndefinedType(props)) + SnapiAttrType("a", SnapiByteType(props)), + SnapiAttrType("b", SnapiShortType(props)), + SnapiAttrType("c", SnapiIntType(props)), + SnapiAttrType("e", SnapiLongType(props)), + SnapiAttrType("f", SnapiFloatType(props)), + SnapiAttrType("g", SnapiDoubleType(props)), + SnapiAttrType("h", SnapiDecimalType(props)), + SnapiAttrType("i", SnapiBoolType(props)), + SnapiAttrType("j", SnapiStringType(props)), + SnapiAttrType("k", SnapiUndefinedType(props)) ), props ), @@ -82,19 +83,19 @@ class Antlr4TypeTests extends RawTestSuite { assert( parseType( "list(record(a: byte, b: short, c: int, e: long, f: float, g: double, h: decimal, i: bool, j: string, k: undefined))" - ) == Rql2ListType( - Rql2RecordType( + ) == SnapiListType( + SnapiRecordType( Vector( - Rql2AttrType("a", Rql2ByteType(props)), - Rql2AttrType("b", Rql2ShortType(props)), - Rql2AttrType("c", Rql2IntType(props)), - Rql2AttrType("e", Rql2LongType(props)), - Rql2AttrType("f", Rql2FloatType(props)), - Rql2AttrType("g", Rql2DoubleType(props)), - Rql2AttrType("h", Rql2DecimalType(props)), - Rql2AttrType("i", Rql2BoolType(props)), - Rql2AttrType("j", Rql2StringType(props)), - Rql2AttrType("k", Rql2UndefinedType(props)) + SnapiAttrType("a", SnapiByteType(props)), + SnapiAttrType("b", SnapiShortType(props)), + SnapiAttrType("c", SnapiIntType(props)), + SnapiAttrType("e", SnapiLongType(props)), + SnapiAttrType("f", SnapiFloatType(props)), + SnapiAttrType("g", SnapiDoubleType(props)), + SnapiAttrType("h", SnapiDecimalType(props)), + SnapiAttrType("i", SnapiBoolType(props)), + SnapiAttrType("j", SnapiStringType(props)), + SnapiAttrType("k", SnapiUndefinedType(props)) ), props ), @@ -105,13 +106,13 @@ class Antlr4TypeTests extends RawTestSuite { // Or type tests test("""2 types or""") { _ => - assert(parseType("int or string") == Rql2OrType(Vector(Rql2IntType(props), Rql2StringType(props)), props)) + assert(parseType("int or string") == SnapiOrType(Vector(SnapiIntType(props), SnapiStringType(props)), props)) } test("""Not nested 3 types or""") { _ => assert( - parseType("int or string or float") == Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props), Rql2FloatType(props)), + parseType("int or string or float") == SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props), SnapiFloatType(props)), props ) ) @@ -119,8 +120,8 @@ class Antlr4TypeTests extends RawTestSuite { test("""Left nested 3 type or""") { _ => assert( - parseType("(int or string) or float") == Rql2OrType( - Vector(Rql2OrType(Vector(Rql2IntType(props), Rql2StringType(props)), props), Rql2FloatType(props)), + parseType("(int or string) or float") == SnapiOrType( + Vector(SnapiOrType(Vector(SnapiIntType(props), SnapiStringType(props)), props), SnapiFloatType(props)), props ) ) @@ -128,8 +129,8 @@ class Antlr4TypeTests extends RawTestSuite { test("""Right nested 3 type or""") { _ => assert( - parseType("(int or string) or float") == Rql2OrType( - Vector(Rql2OrType(Vector(Rql2IntType(props), Rql2StringType(props)), props), Rql2FloatType(props)), + parseType("(int or string) or float") == SnapiOrType( + Vector(SnapiOrType(Vector(SnapiIntType(props), SnapiStringType(props)), props), SnapiFloatType(props)), props ) ) @@ -137,7 +138,7 @@ class Antlr4TypeTests extends RawTestSuite { test("""Function type test""") { _ => assert( - parseType("int -> string") == FunType(Vector(Rql2IntType(props)), Vector.empty, Rql2StringType(props), props) + parseType("int -> string") == FunType(Vector(SnapiIntType(props)), Vector.empty, SnapiStringType(props), props) ) } @@ -146,13 +147,13 @@ class Antlr4TypeTests extends RawTestSuite { parseType("int or string -> float") == FunType( Vector( - Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props)), + SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props)), props ) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -160,8 +161,11 @@ class Antlr4TypeTests extends RawTestSuite { test("""Or type with function alternative test""") { _ => assert( - parseType("int or (string -> float)") == Rql2OrType( - Vector(Rql2IntType(props), FunType(Vector(Rql2StringType(props)), Vector.empty, Rql2FloatType(props), props)), + parseType("int or (string -> float)") == SnapiOrType( + Vector( + SnapiIntType(props), + FunType(Vector(SnapiStringType(props)), Vector.empty, SnapiFloatType(props), props) + ), props ) ) @@ -172,13 +176,13 @@ class Antlr4TypeTests extends RawTestSuite { parseType("(int or string) -> float") == FunType( Vector( - Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props)), + SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props)), props ) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -189,8 +193,8 @@ class Antlr4TypeTests extends RawTestSuite { parseType("(x: int) -> float") == FunType( Vector.empty, - Vector(FunOptTypeParam("x", Rql2IntType(props))), - Rql2FloatType(props), + Vector(FunOptTypeParam("x", SnapiIntType(props))), + SnapiFloatType(props), props ) ) @@ -202,7 +206,7 @@ class Antlr4TypeTests extends RawTestSuite { FunType( Vector.empty, Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -212,9 +216,9 @@ class Antlr4TypeTests extends RawTestSuite { assert( parseType("(int, b: string) -> float") == FunType( - Vector(Rql2IntType(props)), - Vector(FunOptTypeParam("b", Rql2StringType(props))), - Rql2FloatType(props), + Vector(SnapiIntType(props)), + Vector(FunOptTypeParam("b", SnapiStringType(props))), + SnapiFloatType(props), props ) ) @@ -225,13 +229,13 @@ class Antlr4TypeTests extends RawTestSuite { parseType("(int or string, c: float or bool) -> float") == FunType( Vector( - Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props)), + SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props)), props ) ), - Vector(FunOptTypeParam("c", Rql2OrType(Vector(Rql2FloatType(props), Rql2BoolType(props)), props))), - Rql2FloatType(props), + Vector(FunOptTypeParam("c", SnapiOrType(Vector(SnapiFloatType(props), SnapiBoolType(props)), props))), + SnapiFloatType(props), props ) ) @@ -242,10 +246,10 @@ class Antlr4TypeTests extends RawTestSuite { parseType("int -> string -> float") == FunType( Vector( - FunType(Vector(Rql2IntType(props)), Vector.empty, Rql2StringType(props), props) + FunType(Vector(SnapiIntType(props)), Vector.empty, SnapiStringType(props), props) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -256,10 +260,10 @@ class Antlr4TypeTests extends RawTestSuite { parseType("(int -> string) -> float") == FunType( Vector( - FunType(Vector(Rql2IntType(props)), Vector.empty, Rql2StringType(props), props) + FunType(Vector(SnapiIntType(props)), Vector.empty, SnapiStringType(props), props) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -269,9 +273,9 @@ class Antlr4TypeTests extends RawTestSuite { assert( parseType("int -> (string -> float)") == FunType( - Vector(Rql2IntType(props)), + Vector(SnapiIntType(props)), Vector.empty, - FunType(Vector(Rql2StringType(props)), Vector.empty, Rql2FloatType(props), props), + FunType(Vector(SnapiStringType(props)), Vector.empty, SnapiFloatType(props), props), props ) ) diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala index 6da83386d..2d38363da 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/FrontendSyntaxAnalyzerCompareTest.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source.{Exp, SourceNode} -import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer -import com.rawlabs.snapi.frontend.rql2.source.TypeExp +import com.rawlabs.snapi.frontend.snapi.source.{Exp, SourceNode} +import com.rawlabs.snapi.frontend.snapi.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.snapi.source.TypeExp import com.rawlabs.utils.core.RawTestSuite import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala index 3db22b555..f7060578b 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/OldFrontendSyntaxAnalyzerTest.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi import com.rawlabs.snapi.frontend.base.source.{BaseProgram, Type} -import com.rawlabs.snapi.frontend.rql2.source.{IdnDef, IdnExp, IdnUse} -import com.rawlabs.snapi.frontend.rql2.source._ +import com.rawlabs.snapi.frontend.snapi.source.{IdnDef, IdnExp, IdnUse} +import com.rawlabs.snapi.frontend.snapi.source._ import com.rawlabs.utils.core.RawTestSuite class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { @@ -32,46 +32,49 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { } test("""type priority tests""") { _ => - val props = Set[Rql2TypeProperty](Rql2IsNullableTypeProperty(), Rql2IsTryableTypeProperty()) - assert(parseType("int or string") == Rql2OrType(Vector(Rql2IntType(props), Rql2StringType(props)), props)) + val props = Set[SnapiTypeProperty](SnapiIsNullableTypeProperty(), SnapiIsTryableTypeProperty()) + assert(parseType("int or string") == SnapiOrType(Vector(SnapiIntType(props), SnapiStringType(props)), props)) assert( - parseType("int or string or float") == Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props), Rql2FloatType(props)), + parseType("int or string or float") == SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props), SnapiFloatType(props)), props ) ) assert( - parseType("(int or string) or float") == Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props), Rql2FloatType(props)), + parseType("(int or string) or float") == SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props), SnapiFloatType(props)), props ) ) assert( - parseType("int or (string or float)") == Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props), Rql2FloatType(props)), + parseType("int or (string or float)") == SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props), SnapiFloatType(props)), props ) ) assert( - parseType("int -> string") == FunType(Vector(Rql2IntType(props)), Vector.empty, Rql2StringType(props), props) + parseType("int -> string") == FunType(Vector(SnapiIntType(props)), Vector.empty, SnapiStringType(props), props) ) assert( parseType("int or string -> float") == FunType( Vector( - Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props)), + SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props)), props ) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) assert( - parseType("int or (string -> float)") == Rql2OrType( - Vector(Rql2IntType(props), FunType(Vector(Rql2StringType(props)), Vector.empty, Rql2FloatType(props), props)), + parseType("int or (string -> float)") == SnapiOrType( + Vector( + SnapiIntType(props), + FunType(Vector(SnapiStringType(props)), Vector.empty, SnapiFloatType(props), props) + ), props ) ) @@ -79,13 +82,13 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { parseType("(int or string) -> float") == FunType( Vector( - Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props)), + SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props)), props ) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -93,17 +96,17 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { parseType("(x: int) -> float") == FunType( Vector.empty, - Vector(FunOptTypeParam("x", Rql2IntType(props))), - Rql2FloatType(props), + Vector(FunOptTypeParam("x", SnapiIntType(props))), + SnapiFloatType(props), props ) ) assert( parseType("(int, b: string) -> float") == FunType( - Vector(Rql2IntType(props)), - Vector(FunOptTypeParam("b", Rql2StringType(props))), - Rql2FloatType(props), + Vector(SnapiIntType(props)), + Vector(FunOptTypeParam("b", SnapiStringType(props))), + SnapiFloatType(props), props ) ) @@ -111,13 +114,13 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { parseType("(int or string, c: float or bool) -> float") == FunType( Vector( - Rql2OrType( - Vector(Rql2IntType(props), Rql2StringType(props)), + SnapiOrType( + Vector(SnapiIntType(props), SnapiStringType(props)), props ) ), - Vector(FunOptTypeParam("c", Rql2OrType(Vector(Rql2FloatType(props), Rql2BoolType(props)), props))), - Rql2FloatType(props), + Vector(FunOptTypeParam("c", SnapiOrType(Vector(SnapiFloatType(props), SnapiBoolType(props)), props))), + SnapiFloatType(props), props ) ) @@ -125,10 +128,10 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { parseType("int -> string -> float") == FunType( Vector( - FunType(Vector(Rql2IntType(props)), Vector.empty, Rql2StringType(props), props) + FunType(Vector(SnapiIntType(props)), Vector.empty, SnapiStringType(props), props) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) @@ -136,26 +139,26 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { parseType("(int -> string) -> float") == FunType( Vector( - FunType(Vector(Rql2IntType(props)), Vector.empty, Rql2StringType(props), props) + FunType(Vector(SnapiIntType(props)), Vector.empty, SnapiStringType(props), props) ), Vector.empty, - Rql2FloatType(props), + SnapiFloatType(props), props ) ) assert( parseType("int -> (string -> float)") == FunType( - Vector(Rql2IntType(props)), + Vector(SnapiIntType(props)), Vector.empty, - FunType(Vector(Rql2StringType(props)), Vector.empty, Rql2FloatType(props), props), + FunType(Vector(SnapiStringType(props)), Vector.empty, SnapiFloatType(props), props), props ) ) assert( parseType("list(int)") == - Rql2ListType( - Rql2IntType(props), + SnapiListType( + SnapiIntType(props), props ) ) @@ -167,7 +170,7 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { | let f = (v: int): string -> v | in f (1) | """.stripMargin) == - Rql2Program( + SnapiProgram( Vector(), Some( Let( @@ -178,11 +181,11 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { Vector( FunParam( IdnDef("v"), - Some(Rql2IntType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + Some(SnapiIntType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))), None ) ), - Some(Rql2StringType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + Some(SnapiStringType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))), FunBody(IdnExp(IdnUse("v"))) ) ), @@ -203,7 +206,7 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { |let apply(boolFunc: (int -> bool) -> bool) = boolFunc((x: int) -> x > 10) |in apply((f: int -> bool) -> f(14)) |""".stripMargin) == - Rql2Program( + SnapiProgram( Vector(), Some( Let( @@ -217,15 +220,15 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { FunType( Vector( FunType( - Vector(Rql2IntType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + Vector(SnapiIntType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))), Vector(), - Rql2BoolType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty())), - Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()) + SnapiBoolType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty())), + Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()) ) ), Vector(), - Rql2BoolType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty())), - Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()) + SnapiBoolType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty())), + Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()) ) ), None @@ -242,7 +245,9 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { Vector( FunParam( IdnDef("x"), - Some(Rql2IntType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + Some( + SnapiIntType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty())) + ), None ) ), @@ -270,10 +275,10 @@ class OldFrontendSyntaxAnalyzerTest extends RawTestSuite { IdnDef("f"), Some( FunType( - Vector(Rql2IntType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()))), + Vector(SnapiIntType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()))), Vector(), - Rql2BoolType(Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty())), - Set(Rql2IsTryableTypeProperty(), Rql2IsNullableTypeProperty()) + SnapiBoolType(Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty())), + Set(SnapiIsTryableTypeProperty(), SnapiIsNullableTypeProperty()) ) ), None diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala index 6bb98d1f4..d96ff70f9 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/PrettyPrintTest.scala @@ -10,9 +10,9 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source.SourceCommentsPrettyPrinter +import com.rawlabs.snapi.frontend.snapi.source.SourceCommentsPrettyPrinter import com.rawlabs.utils.core.RawTestSuite import org.scalatest.Assertion diff --git a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala index fb2a9808e..6a1d07909 100644 --- a/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala +++ b/snapi-frontend/src/test/scala/com/rawlabs/snapi/frontend/rql2/SyntaxAnalyzerCompareTest.scala @@ -10,11 +10,11 @@ * licenses/APL.txt. */ -package com.rawlabs.snapi.frontend.rql2 +package com.rawlabs.snapi.frontend.snapi -import com.rawlabs.snapi.frontend.rql2.source.{Exp, SourceNode} -import com.rawlabs.snapi.frontend.rql2.antlr4.Antlr4SyntaxAnalyzer -import com.rawlabs.snapi.frontend.rql2.source.TypeExp +import com.rawlabs.snapi.frontend.snapi.source.{Exp, SourceNode} +import com.rawlabs.snapi.frontend.snapi.antlr4.Antlr4SyntaxAnalyzer +import com.rawlabs.snapi.frontend.snapi.source.TypeExp import com.rawlabs.utils.core.RawTestSuite import org.bitbucket.inkytonik.kiama.rewriting.Cloner.{everywhere, query} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Context.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiContext.java similarity index 91% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Context.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiContext.java index 3db908a3a..fd628e4e8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Context.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiContext.java @@ -29,9 +29,9 @@ import java.util.Set; import scala.collection.JavaConverters; -public final class Rql2Context { +public final class SnapiContext { - private final Rql2Language language; + private final SnapiLanguage language; private final Env env; private final RawSettings rawSettings; private final OutputStream output; @@ -39,12 +39,12 @@ public final class Rql2Context { private final FunctionRegistry functionRegistry; @CompilerDirectives.TruffleBoundary - public Rql2Context(Rql2Language language, Env env) { + public SnapiContext(SnapiLanguage language, Env env) { this.language = language; this.env = env; this.output = env.out(); - String rawSettingsConfigString = env.getOptions().get(Rql2Options.RAW_SETTINGS_KEY); + String rawSettingsConfigString = env.getOptions().get(SnapiOptions.RAW_SETTINGS_KEY); // If settings were passed as Engine options, used those as our settings. // Otherwise, default to the settings from the language, which are obtained from the system. if (rawSettingsConfigString.isEmpty()) { @@ -70,7 +70,7 @@ public FunctionRegistry getFunctionRegistry() { return functionRegistry; } - public Rql2Language getLanguage() { + public SnapiLanguage getLanguage() { return language; } @@ -142,10 +142,10 @@ public String[] getScopes() { return javaScopes.toArray(new String[0]); } - private static final TruffleLanguage.ContextReference REFERENCE = - TruffleLanguage.ContextReference.create(Rql2Language.class); + private static final TruffleLanguage.ContextReference REFERENCE = + TruffleLanguage.ContextReference.create(SnapiLanguage.class); - public static Rql2Context get(Node node) { + public static SnapiContext get(Node node) { return REFERENCE.get(node); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Language.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiLanguage.java similarity index 84% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Language.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiLanguage.java index 725140213..b38ba7edd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Language.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiLanguage.java @@ -30,15 +30,15 @@ import com.rawlabs.snapi.frontend.base.Phase; import com.rawlabs.snapi.frontend.base.source.Type; import com.rawlabs.snapi.frontend.inferrer.api.InferrerService; -import com.rawlabs.snapi.frontend.rql2.*; -import com.rawlabs.snapi.frontend.rql2.PhaseDescriptor; -import com.rawlabs.snapi.frontend.rql2.phases.ImplicitCastsPhase; -import com.rawlabs.snapi.frontend.rql2.phases.ListProjDesugarerPhase; -import com.rawlabs.snapi.frontend.rql2.phases.PropagationPhase; -import com.rawlabs.snapi.frontend.rql2.phases.SugarExtensionDesugarerPhase; -import com.rawlabs.snapi.frontend.rql2.source.InternalSourcePrettyPrinter; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Program; -import com.rawlabs.snapi.frontend.rql2.source.SourceProgram; +import com.rawlabs.snapi.frontend.snapi.*; +import com.rawlabs.snapi.frontend.snapi.PhaseDescriptor; +import com.rawlabs.snapi.frontend.snapi.phases.ImplicitCastsPhase; +import com.rawlabs.snapi.frontend.snapi.phases.ListProjDesugarerPhase; +import com.rawlabs.snapi.frontend.snapi.phases.PropagationPhase; +import com.rawlabs.snapi.frontend.snapi.phases.SugarExtensionDesugarerPhase; +import com.rawlabs.snapi.frontend.snapi.source.InternalSourcePrettyPrinter; +import com.rawlabs.snapi.frontend.snapi.source.SnapiProgram; +import com.rawlabs.snapi.frontend.snapi.source.SourceProgram; import com.rawlabs.snapi.truffle.emitter.TruffleEmit; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleValidationException; import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; @@ -52,11 +52,11 @@ import scala.collection.JavaConverters; @TruffleLanguage.Registration( - id = Rql2Language.ID, - name = "RQL", - version = Rql2Language.VERSION, - defaultMimeType = Rql2Language.MIME_TYPE, - characterMimeTypes = Rql2Language.MIME_TYPE) + id = SnapiLanguage.ID, + name = "Snapi", + version = SnapiLanguage.VERSION, + defaultMimeType = SnapiLanguage.MIME_TYPE, + characterMimeTypes = SnapiLanguage.MIME_TYPE) @ProvidedTags({ StandardTags.CallTag.class, StandardTags.StatementTag.class, @@ -66,13 +66,13 @@ StandardTags.ReadVariableTag.class, StandardTags.WriteVariableTag.class }) -public final class Rql2Language extends TruffleLanguage { +public final class SnapiLanguage extends TruffleLanguage { - public static final String ID = "rql"; + public static final String ID = "snapi"; public static final String VERSION = "0.10"; - public static final String MIME_TYPE = "application/x-rql"; + public static final String MIME_TYPE = "application/x-snapi"; - private static final Rql2LanguageCache languageCache = new Rql2LanguageCache(); + private static final SnapiLanguageCache languageCache = new SnapiLanguageCache(); private static final RawSettings defaultRawSettings = new RawSettings(ConfigFactory.load(), ConfigFactory.empty()); @@ -92,23 +92,23 @@ public DuplicateKeyRecord createDuplicateKeyRecord() { } @Override - protected final Rql2Context createContext(Env env) { - Rql2Context context = new Rql2Context(this, env); + protected final SnapiContext createContext(Env env) { + SnapiContext context = new SnapiContext(this, env); // The language cache keeps track of active contexts, so that it knows when to shutdown itself. languageCache.incrementContext(context); return context; } @Override - protected void finalizeContext(Rql2Context context) { + protected void finalizeContext(SnapiContext context) { // The language cache keeps track of active contexts, so that it knows when to shutdown itself. languageCache.releaseContext(context); } - private static final LanguageReference REFERENCE = - LanguageReference.create(Rql2Language.class); + private static final LanguageReference REFERENCE = + LanguageReference.create(SnapiLanguage.class); - public static Rql2Language get(Node node) { + public static SnapiLanguage get(Node node) { return REFERENCE.get(node); } @@ -116,12 +116,12 @@ public static Rql2Language get(Node node) { @Override protected OptionDescriptors getOptionDescriptors() { - return Rql2Options.OPTION_DESCRIPTORS; + return SnapiOptions.OPTION_DESCRIPTORS; } @Override protected CallTarget parse(ParsingRequest request) throws Exception { - Rql2Context context = Rql2Context.get(null); + SnapiContext context = SnapiContext.get(null); ProgramContext programContext = new ProgramContext( @@ -136,13 +136,13 @@ protected CallTarget parse(ParsingRequest request) throws Exception { if (context .getEnv() .getOptions() - .get(Rql2Options.STAGED_COMPILER_KEY) + .get(SnapiOptions.STAGED_COMPILER_KEY) .equalsIgnoreCase("true")) { frontend = false; } TreeWithPositions tree = new TreeWithPositions(source, false, frontend, programContext); if (tree.valid()) { - Rql2Program inputProgram = (Rql2Program) tree.root(); + SnapiProgram inputProgram = (SnapiProgram) tree.root(); SourceProgram outputProgram = transpile(inputProgram, programContext); Entrypoint entrypoint = TruffleEmit.doEmit(outputProgram, this, programContext); RootNode rootNode = (RootNode) entrypoint.target(); @@ -237,7 +237,7 @@ private Phase buildPipeline( // We return the function registry as a polyglot 'hasMembers' object (members // are the function names, that resolve to the function objects). @Override - protected Object getScope(Rql2Context context) { + protected Object getScope(SnapiContext context) { return context.getFunctionRegistry().asPolyglot(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2LanguageCache.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiLanguageCache.java similarity index 90% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2LanguageCache.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiLanguageCache.java index 1764ac576..8b3112001 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2LanguageCache.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiLanguageCache.java @@ -24,10 +24,10 @@ import java.util.concurrent.ConcurrentHashMap; import scala.runtime.BoxedUnit; -public class Rql2LanguageCache { +public class SnapiLanguageCache { private final Object activeContextsLock = new Object(); - private final Set activeContexts = new HashSet(); + private final Set activeContexts = new HashSet(); private final ConcurrentHashMap map = new ConcurrentHashMap<>(); @@ -56,7 +56,7 @@ private Value get(RawUid user, RawSettings rawSettings) { k -> { InferrerService inferrer = InferrerServiceProvider.apply(rawSettings); CompilerContext compilerContext = - new CompilerContext("rql2-truffle", user, inferrer, rawSettings); + new CompilerContext("snapi", user, inferrer, rawSettings); return new Value(compilerContext, inferrer); }); } @@ -70,14 +70,14 @@ public InferrerService getInferrer(RawUid user, RawSettings rawSettings) { } @CompilerDirectives.TruffleBoundary - public void incrementContext(Rql2Context context) { + public void incrementContext(SnapiContext context) { synchronized (activeContextsLock) { activeContexts.add(context); } } @CompilerDirectives.TruffleBoundary - public void releaseContext(Rql2Context context) { + public void releaseContext(SnapiContext context) { synchronized (activeContextsLock) { activeContexts.remove(context); if (activeContexts.isEmpty()) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Options.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiOptions.java similarity index 95% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Options.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiOptions.java index ec4b95a6e..cec34ad83 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Options.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiOptions.java @@ -16,7 +16,7 @@ import org.graalvm.options.OptionDescriptors; import org.graalvm.options.OptionKey; -public class Rql2Options { +public class SnapiOptions { public static final String STAGED_COMPILER = optionName("staged-compiler"); public static final OptionKey STAGED_COMPILER_KEY = new OptionKey<>(""); @@ -34,6 +34,6 @@ public class Rql2Options { java.util.Arrays.asList(STAGED_COMPILER_DESCRIPTOR, RAW_SETTINGS_DESCRIPTOR)); private static String optionName(String name) { - return Rql2Language.ID + "." + name; + return SnapiLanguage.ID + "." + name; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Types.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiTypes.java similarity index 96% rename from snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Types.java rename to snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiTypes.java index 831a38762..0e758553b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/Rql2Types.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/SnapiTypes.java @@ -36,4 +36,4 @@ PureRecord.class, DuplicateKeyRecord.class }) -public abstract class Rql2Types {} +public abstract class SnapiTypes {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java index 785dc5487..9e2c4c4ed 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ExpressionNode.java @@ -19,13 +19,13 @@ import com.oracle.truffle.api.instrumentation.StandardTags; import com.oracle.truffle.api.instrumentation.Tag; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.truffle.Rql2Types; -import com.rawlabs.snapi.truffle.Rql2TypesGen; +import com.rawlabs.snapi.truffle.SnapiTypes; +import com.rawlabs.snapi.truffle.SnapiTypesGen; import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.snapi.truffle.runtime.record.DuplicateKeyRecord; import com.rawlabs.snapi.truffle.runtime.record.PureRecord; -@TypeSystemReference(Rql2Types.class) +@TypeSystemReference(SnapiTypes.class) @GenerateWrapper public abstract class ExpressionNode extends StatementNode { @@ -38,75 +38,75 @@ public void executeVoid(VirtualFrame virtualFrame) { } public boolean executeBoolean(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectBoolean(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectBoolean(executeGeneric(virtualFrame)); } public byte executeByte(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectByte(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectByte(executeGeneric(virtualFrame)); } public short executeShort(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectShort(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectShort(executeGeneric(virtualFrame)); } public int executeInt(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectInteger(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectInteger(executeGeneric(virtualFrame)); } public long executeLong(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectLong(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectLong(executeGeneric(virtualFrame)); } public float executeFloat(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectFloat(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectFloat(executeGeneric(virtualFrame)); } public double executeDouble(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectDouble(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectDouble(executeGeneric(virtualFrame)); } public BinaryObject executeBinary(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectBinaryObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectBinaryObject(executeGeneric(virtualFrame)); } public DecimalObject executeDecimal(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectDecimalObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectDecimalObject(executeGeneric(virtualFrame)); } public DateObject executeDate(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectDateObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectDateObject(executeGeneric(virtualFrame)); } public IntervalObject executeInterval(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectIntervalObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectIntervalObject(executeGeneric(virtualFrame)); } public TimeObject executeTime(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectTimeObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectTimeObject(executeGeneric(virtualFrame)); } public TimestampObject executeTimestamp(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectTimestampObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectTimestampObject(executeGeneric(virtualFrame)); } public String executeString(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectString(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectString(executeGeneric(virtualFrame)); } public LocationObject executeLocation(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectLocationObject(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectLocationObject(executeGeneric(virtualFrame)); } public PureRecord executePureRecord(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectPureRecord(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectPureRecord(executeGeneric(virtualFrame)); } public DuplicateKeyRecord executeDuplicateKey(VirtualFrame virtualFrame) throws UnexpectedResultException { - return Rql2TypesGen.expectDuplicateKeyRecord(executeGeneric(virtualFrame)); + return SnapiTypesGen.expectDuplicateKeyRecord(executeGeneric(virtualFrame)); } @Override diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java index cfb8ceddf..322af83e5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramExpressionNode.java @@ -17,17 +17,17 @@ import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.source.Source; import com.oracle.truffle.api.source.SourceSection; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; public final class ProgramExpressionNode extends RootNode { private static final Source DUMMY_SOURCE = - Source.newBuilder(Rql2Language.ID, "", "dummy").build(); + Source.newBuilder(SnapiLanguage.ID, "", "dummy").build(); @Child private ExpressionNode bodyNode; public ProgramExpressionNode( - Rql2Language language, FrameDescriptor frameDescriptor, ExpressionNode body) { + SnapiLanguage language, FrameDescriptor frameDescriptor, ExpressionNode body) { super(language, frameDescriptor); this.bodyNode = body; this.bodyNode.addRootTag(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java index 75383d8d7..f7b81c839 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/ProgramStatementNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.RootNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; public final class ProgramStatementNode extends RootNode { @@ -25,7 +25,7 @@ public final class ProgramStatementNode extends RootNode { @Child protected StatementNode bodyNode; public ProgramStatementNode( - Rql2Language language, FrameDescriptor frameDescriptor, StatementNode body) { + SnapiLanguage language, FrameDescriptor frameDescriptor, StatementNode body) { super(language, frameDescriptor); this.bodyNode = body; this.bodyNode.addRootTag(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java index 2ec69e86b..a4eee09df 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/TypeGuards.java @@ -14,197 +14,197 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Idempotent; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; public class TypeGuards { - public static final Rql2IsTryableTypeProperty tryable = Rql2IsTryableTypeProperty.apply(); - public static final Rql2IsNullableTypeProperty nullable = Rql2IsNullableTypeProperty.apply(); + public static final SnapiIsTryableTypeProperty tryable = SnapiIsTryableTypeProperty.apply(); + public static final SnapiIsNullableTypeProperty nullable = SnapiIsNullableTypeProperty.apply(); @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isTryable(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties.props().contains(tryable); + public static boolean isTryable(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties.props().contains(tryable); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isNullable(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties.props().contains(nullable); + public static boolean isNullable(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties.props().contains(nullable); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isBooleanKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2BoolType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isBooleanKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiBoolType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isByteKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2ByteType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isByteKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiByteType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isShortKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2ShortType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isShortKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiShortType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isIntKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2IntType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isIntKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiIntType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isLongKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2LongType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isLongKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiLongType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isFloatKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2FloatType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isFloatKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiFloatType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isDoubleKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2DoubleType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isDoubleKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiDoubleType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isDecimalKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2DecimalType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isDecimalKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiDecimalType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isStringKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2StringType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isStringKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiStringType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isIntervalKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2IntervalType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isIntervalKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiIntervalType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isDateKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2DateType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isDateKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiDateType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isTimeKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2TimeType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isTimeKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiTimeType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isTimestampKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2TimestampType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isTimestampKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiTimestampType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isRecordKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2RecordType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isRecordKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiRecordType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isListKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2ListType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isListKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiListType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isIterableKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2IterableType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isIterableKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiIterableType + && snapiTypeWithProperties.props().isEmpty(); } return false; } @Idempotent @CompilerDirectives.TruffleBoundary - public static boolean isBinaryKind(Rql2Type rql2Type) { - if (rql2Type instanceof Rql2TypeWithProperties rql2TypeWithProperties) { - return rql2TypeWithProperties instanceof Rql2BinaryType - && rql2TypeWithProperties.props().isEmpty(); + public static boolean isBinaryKind(SnapiType snapiType) { + if (snapiType instanceof SnapiTypeWithProperties snapiTypeWithProperties) { + return snapiTypeWithProperties instanceof SnapiBinaryType + && snapiTypeWithProperties.props().isEmpty(); } return false; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java index c7c999b15..5cc6e961a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/aws_package/AwsV4SignedRequestNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiContext; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import com.rawlabs.snapi.truffle.runtime.list.ListNodes; @@ -197,16 +197,16 @@ protected LocationObject doRequest( allHeaders[i] = getNode.execute(this, headers, i); } - allHeaders[headersSize] = Rql2Language.get(this).createPureRecord(); + allHeaders[headersSize] = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute(this, allHeaders[headersSize], "_1", "host", false); addPropNode.execute(this, allHeaders[headersSize], "_2", host, false); - allHeaders[headersSize + 1] = Rql2Language.get(this).createPureRecord(); + allHeaders[headersSize + 1] = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute(this, allHeaders[headersSize + 1], "_1", "x-amz-date", false); addPropNode.execute(this, allHeaders[headersSize + 1], "_2", amzdate, false); if (!sessionToken.isEmpty()) { - allHeaders[headersSize + 2] = Rql2Language.get(this).createPureRecord(); + allHeaders[headersSize + 2] = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute(this, allHeaders[headersSize + 2], "_1", "x-amz-security-token", false); addPropNode.execute(this, allHeaders[headersSize + 2], "_2", sessionToken, false); } @@ -325,7 +325,7 @@ protected LocationObject doRequest( HttpURLConnection.HTTP_PARTIAL }; - RawSettings rawSettings = Rql2Context.get(this).getSettings(); + RawSettings rawSettings = SnapiContext.get(this).getSettings(); HttpByteStreamLocation location = new HttpByteStreamLocation( diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java index 4e8da4540..d33304a60 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentParameterNode.java @@ -21,8 +21,8 @@ import com.oracle.truffle.api.library.CachedLibrary; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.TypeGuards; import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; @@ -31,17 +31,17 @@ @ImportStatic(value = {TypeGuards.class, StaticInitializers.class}) @NodeInfo(shortName = "Environment.Parameter") @NodeChild(value = "key") -@NodeField(name = "paramType", type = Rql2Type.class) +@NodeField(name = "paramType", type = SnapiType.class) public abstract class EnvironmentParameterNode extends ExpressionNode { @Idempotent - protected abstract Rql2Type getParamType(); + protected abstract SnapiType getParamType(); @Specialization(guards = {"isByteKind(getParamType())"}) protected byte getByte( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -56,7 +56,7 @@ protected byte getByte( protected short getShort( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -71,7 +71,7 @@ protected short getShort( protected int getInt( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -86,7 +86,7 @@ protected int getInt( protected long getLong( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -101,7 +101,7 @@ protected long getLong( protected float getFloat( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -116,7 +116,7 @@ protected float getFloat( protected Double getDouble( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -131,7 +131,7 @@ protected Double getDouble( protected DecimalObject getDecimal( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -146,7 +146,7 @@ protected DecimalObject getDecimal( protected boolean getBool( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -161,7 +161,7 @@ protected boolean getBool( protected String getString( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -176,7 +176,7 @@ protected String getString( protected DateObject getDate( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -191,7 +191,7 @@ protected DateObject getDate( protected TimeObject getTime( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -206,7 +206,7 @@ protected TimeObject getTime( protected TimestampObject getTimestamp( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); @@ -222,7 +222,7 @@ protected TimestampObject getTimestamp( protected IntervalObject getInterval( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context, + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context, @CachedLibrary(limit = "3") @Cached.Shared("interop") InteropLibrary bindings) { TruffleObject polyglotBindings = context.getPolyglotBindings(); assert bindings.hasMembers(polyglotBindings); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java index f3a806604..161bded72 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/environment_package/EnvironmentSecretNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; @@ -30,7 +30,7 @@ public abstract class EnvironmentSecretNode extends ExpressionNode { protected static Object doSecret( String key, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Context(thisNode)", neverDefault = true) Rql2Context context) { + @Cached(value = "getSnapiContext(thisNode)", neverDefault = true) SnapiContext context) { try { return context.getSecret(key); } catch (TruffleRuntimeException e) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java index 8b73140f9..3cd27550f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/http_package/HttpReadNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; @@ -54,7 +54,7 @@ protected static Object doRead( try { HttpByteStreamLocation location = locationObject.getHttpByteStreamLocation(); HttpResult result = location.getHttpResult(); - Object record = Rql2Language.get(thisNode).createPureRecord(); + Object record = SnapiLanguage.get(thisNode).createPureRecord(); if (!isNullNode.execute(thisNode, statusListOption)) { int[] statuses = new int[(int) sizeNode.execute(thisNode, statusListOption)]; @@ -83,7 +83,7 @@ protected static Object doRead( Object[] headers = new Object[result.headers().size()]; for (int i = 0; i < result.headers().size(); i++) { - headers[i] = Rql2Language.get(thisNode).createPureRecord(); + headers[i] = SnapiLanguage.get(thisNode).createPureRecord(); addPropNode.execute(thisNode, headers[i], "_1", headerTuples.apply(i)._1(), false); addPropNode.execute(thisNode, headers[i], "_2", headerTuples.apply(i)._2(), false); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java index 2b82c3426..b59120664 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/jdbc/JdbcQueryNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.rdbms.JdbcExceptionHandler; @@ -44,7 +44,7 @@ public JdbcQueryNode( @Override public Object executeGeneric(VirtualFrame virtualFrame) { - RawSettings rawSettings = Rql2Context.get(this).getSettings(); + RawSettings rawSettings = SnapiContext.get(this).getSettings(); LocationObject dbLocation = (LocationObject) locationExp.executeGeneric(virtualFrame); String query = (String) this.queryExp.executeGeneric(virtualFrame); return new JdbcQueryCollection( 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 287011905..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 @@ -18,10 +18,10 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.inferrer.api.*; -import com.rawlabs.snapi.frontend.rql2.Rql2TypeUtils$; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.Rql2Context; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.SnapiTypeUtils$; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.truffle.SnapiContext; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.list.ObjectList; import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; @@ -48,7 +48,7 @@ protected Object doDescribe( LocationObject locationObject, int sampleSize, @Cached(inline = true) RecordNodes.AddPropNode addPropNode) { - InferrerService inferrer = Rql2Context.get(this).getInferrer(); + InferrerService inferrer = SnapiContext.get(this).getInferrer(); try { // In scala implementation interpreter there is a sample size argument InferrerOutput descriptor = @@ -136,24 +136,24 @@ protected Object doDescribe( } } - Rql2Type rql2Type = - (Rql2Type) Rql2TypeUtils$.MODULE$.inferTypeToRql2Type(tipe, sampled, sampled); - Rql2Type flatten = rql2Type; + SnapiType snapiType = + (SnapiType) SnapiTypeUtils$.MODULE$.inferTypeToSnapiType(tipe, sampled, sampled); + SnapiType flatten = snapiType; boolean isCollection = false; - if (rql2Type instanceof Rql2IterableType) { - Rql2IterableType rql2IterableType = (Rql2IterableType) rql2Type; - flatten = (Rql2Type) rql2IterableType.innerType(); + if (snapiType instanceof SnapiIterableType) { + SnapiIterableType snapiIterableType = (SnapiIterableType) snapiType; + flatten = (SnapiType) snapiIterableType.innerType(); isCollection = true; - } else if (rql2Type instanceof Rql2ListType) { - Rql2ListType rql2IterableType = (Rql2ListType) rql2Type; - flatten = (Rql2Type) rql2IterableType.innerType(); + } else if (snapiType instanceof SnapiListType) { + SnapiListType snapiIterableType = (SnapiListType) snapiType; + flatten = (SnapiType) snapiIterableType.innerType(); isCollection = true; } - String formattedType = SourcePrettyPrinter$.MODULE$.format(rql2Type); + String formattedType = SourcePrettyPrinter$.MODULE$.format(snapiType); - Object record = Rql2Language.get(this).createPureRecord(); + Object record = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute(this, record, "format", format, false); addPropNode.execute(this, record, "comment", comment, false); @@ -163,7 +163,7 @@ protected Object doDescribe( // properties List keyList = new ArrayList<>(properties.keySet()); for (int i = 0; i < keyList.size(); i++) { - Object rec = Rql2Language.get(this).createPureRecord(); + Object rec = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute(this, rec, "name", keyList.get(i), false); if (properties.containsKey(keyList.get(i))) { addPropNode.execute(this, rec, "value", properties.get(keyList.get(i)), false); @@ -178,20 +178,20 @@ protected Object doDescribe( addPropNode.execute(this, record, "is_collection", isCollection, false); // columns - if (flatten instanceof Rql2RecordType) { - Rql2RecordType rql2RecordType = (Rql2RecordType) flatten; - Object[] columnRecords = new Object[rql2RecordType.atts().length()]; - for (int i = 0; i < rql2RecordType.atts().length(); i++) { + if (flatten instanceof SnapiRecordType) { + SnapiRecordType snapiRecordType = (SnapiRecordType) flatten; + Object[] columnRecords = new Object[snapiRecordType.atts().length()]; + for (int i = 0; i < snapiRecordType.atts().length(); i++) { String typeStr; boolean isNullable; - Rql2TypeWithProperties fieldType = - (Rql2TypeWithProperties) rql2RecordType.atts().apply(i).tipe(); + SnapiTypeWithProperties fieldType = + (SnapiTypeWithProperties) snapiRecordType.atts().apply(i).tipe(); typeStr = SourcePrettyPrinter$.MODULE$.format(fieldType); - isNullable = fieldType.props().contains(Rql2IsNullableTypeProperty.apply()); - Object column = Rql2Language.get(this).createPureRecord(); + isNullable = fieldType.props().contains(SnapiIsNullableTypeProperty.apply()); + Object column = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute( - this, column, "col_name", rql2RecordType.atts().apply(i).idn(), false); + this, column, "col_name", snapiRecordType.atts().apply(i).idn(), false); addPropNode.execute(this, column, "col_type", typeStr, false); addPropNode.execute(this, column, "nullable", isNullable, false); columnRecords[i] = column; @@ -201,16 +201,16 @@ protected Object doDescribe( } else { String typeStr; boolean isNullable = false; - if (flatten instanceof Rql2TypeWithProperties) { + if (flatten instanceof SnapiTypeWithProperties) { typeStr = SourcePrettyPrinter$.MODULE$.format(flatten); isNullable = - ((Rql2TypeWithProperties) flatten) + ((SnapiTypeWithProperties) flatten) .props() - .contains(Rql2IsNullableTypeProperty.apply()); + .contains(SnapiIsNullableTypeProperty.apply()); } else { typeStr = SourcePrettyPrinter$.MODULE$.format(flatten); } - Object column = Rql2Language.get(this).createPureRecord(); + Object column = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute(this, column, "col_name", NullObject.INSTANCE, false); addPropNode.execute(this, column, "col_type", typeStr, false); addPropNode.execute(this, column, "nullable", isNullable, false); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java index 2ac1582f6..e83d0a5d5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromHttpNode.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.HttpHeadersConfig; import com.rawlabs.protocol.compiler.LocationConfig; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import com.rawlabs.snapi.truffle.runtime.list.ListNodes; @@ -164,7 +164,7 @@ public Object executeGeneric(VirtualFrame frame) { .encodeToString((username + ":" + password).getBytes()))); } - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); // Append any additional headers related to the authentication (if credential name is defined) if (this.authCredentialName != null) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java index 6ee8c1e5c..721ac5277 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLCredentialNode.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.MySqlConfig; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.*; @@ -36,7 +36,7 @@ public LocationFromMySQLCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java index 0f89f0d8b..87f3bfa01 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromMySQLNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, Rql2Context.get(this).getSettings()); + host, port, db, username, password, SnapiContext.get(this).getSettings()); return new LocationObject(location, "mysql:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java index 6767fa483..1b7216fa1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleCredentialNode.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.OracleConfig; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.*; @@ -36,7 +36,7 @@ public LocationFromOracleCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java index 4d95dd313..1e38a25a8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromOracleNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, Rql2Context.get(this).getSettings()); + host, port, db, username, password, SnapiContext.get(this).getSettings()); return new LocationObject(location, "oracle:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java index 6f6d48602..8a90f3e9a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLCredentialNode.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.PostgreSQLConfig; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.*; @@ -36,7 +36,7 @@ public LocationFromPostgreSQLCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java index 8994a1380..0118f36e6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromPostgreSQLNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.primitives.*; import com.rawlabs.utils.core.RawSettings; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, Rql2Context.get(this).getSettings()); + host, port, db, username, password, SnapiContext.get(this).getSettings()); return new LocationObject(location, "pgsql:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java index d8db84cf3..ae080c584 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromS3Node.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.S3Config; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.*; @@ -69,7 +69,7 @@ public Object executeGeneric(VirtualFrame frame) { // "If the S3 bucket is not registered in the credentials storage, then the region, accessKey // and secretKey must be provided as arguments." // However, if the access key/secret key are passed, they should be used. - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); S3Path location; if (this.accessKey == null && this.secretKey == null diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java index d996544c8..f266bf405 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerCredentialNode.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.SQLServerConfig; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.*; @@ -36,7 +36,7 @@ public LocationFromSQLServerCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java index bc62c22a1..ed3abefae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSQLServerNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; @@ -54,7 +54,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - host, port, db, username, password, Rql2Context.get(this).getSettings()); + host, port, db, username, password, SnapiContext.get(this).getSettings()); return new LocationObject(location, "sqlserver:" + db); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java index 42bfe0a98..b8e522c2a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeCredentialNode.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.protocol.compiler.LocationConfig; import com.rawlabs.protocol.compiler.SnowflakeConfig; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.*; @@ -36,7 +36,7 @@ public LocationFromSnowflakeCredentialNode(ExpressionNode credentialName) { @Override public Object executeGeneric(VirtualFrame frame) { - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); String credentialName = (String) this.credentialName.executeGeneric(frame); LocationConfig l = context.getLocationConfig(credentialName); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java index 17b14089e..d475d1db7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromSnowflakeNode.java @@ -19,7 +19,7 @@ import com.oracle.truffle.api.interop.UnknownIdentifierException; import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import com.rawlabs.snapi.truffle.runtime.list.ListNodes; @@ -84,7 +84,7 @@ public Object executeGeneric(VirtualFrame frame) { JdbcServerLocation location = getJdbcServerLocation( - db, username, password, accountID, parameters, Rql2Context.get(this).getSettings()); + db, username, password, accountID, parameters, SnapiContext.get(this).getSettings()); return new LocationObject(location, "snowflake:" + db); } catch (UnsupportedMessageException diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java index 6b0f0c69f..9356b512f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationFromStringNode.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; @@ -36,14 +36,14 @@ public LocationFromStringNode(ExpressionNode url) { public Object executeGeneric(VirtualFrame frame) { String url = (String) this.url.executeGeneric(frame); - Rql2Context context = Rql2Context.get(this); + SnapiContext context = SnapiContext.get(this); Location location = getLocationFromUrl(url, context); return new LocationObject(location, url); } @CompilerDirectives.TruffleBoundary - private Location getLocationFromUrl(String url, Rql2Context context) { + private Location getLocationFromUrl(String url, SnapiContext context) { Either maybeLocation = LocationDescription$.MODULE$.urlToLocation( url, context.getProgramEnvironment(), context.getSettings()); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java index 5566a3d0b..9d7d4b8e5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLlNode.java @@ -17,8 +17,8 @@ import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.list.ObjectList; import com.rawlabs.snapi.truffle.runtime.list.StringList; @@ -49,8 +49,8 @@ protected Object doLl( Object[] result = new Object[size]; for (int i = 0; i < size; i++) { - Object topRecord = Rql2Language.get(this).createPureRecord(); - Object metadata = Rql2Language.get(this).createPureRecord(); + Object topRecord = SnapiLanguage.get(this).createPureRecord(); + Object metadata = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute( this, topRecord, @@ -95,7 +95,7 @@ protected Object doLl( int blocksSize = fileMetadata.blocks().length; Object[] blocks = new Object[blocksSize]; for (int j = 0; j < blocksSize; j++) { - Object block = Rql2Language.get(this).createPureRecord(); + Object block = SnapiLanguage.get(this).createPureRecord(); addPropNode.execute( this, block, "hosts", new StringList(fileMetadata.blocks()[j].hosts()), false); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java index d53abc78d..0aad6996f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/builtin/location_package/LocationLsNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription$; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.list.StringList; import com.rawlabs.snapi.truffle.runtime.primitives.ErrorObject; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java index 5293e58ae..ce2ebe7dd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/function/MethodNode.java @@ -14,7 +14,7 @@ import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.function.Closure; import com.rawlabs.snapi.truffle.runtime.function.Function; @@ -35,7 +35,7 @@ public final class MethodNode extends ExpressionNode { private final String name; private final boolean hasFreeVars; private final boolean hasOptionalArgs; - private final FunctionRegistry functionRegistry = Rql2Context.get(this).getFunctionRegistry(); + private final FunctionRegistry functionRegistry = SnapiContext.get(this).getFunctionRegistry(); public MethodNode( String name, Function f, ExpressionNode[] defaultArgumentExps, boolean hasFreeVars) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java index 4445d0b3d..825087550 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/ArrayOperationNodes.java @@ -18,7 +18,7 @@ import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.TypeGuards; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import com.rawlabs.snapi.truffle.runtime.list.*; @@ -32,50 +32,50 @@ public class ArrayOperationNodes { @ImportStatic(TypeGuards.class) public abstract static class ArrayBuildNode extends Node { - public abstract Object execute(Node node, Rql2Type resultType, int size); + public abstract Object execute(Node node, SnapiType resultType, int size); @Specialization(guards = "isByteKind(resultType)") - static byte[] buildByte(Node node, Rql2Type resultType, int size) { + static byte[] buildByte(Node node, SnapiType resultType, int size) { return new byte[size]; } @Specialization(guards = "isShortKind(resultType)") - static short[] buildShort(Node node, Rql2Type resultType, int size) { + static short[] buildShort(Node node, SnapiType resultType, int size) { return new short[size]; } @Specialization(guards = "isIntKind(resultType)") - static int[] buildInt(Node node, Rql2Type resultType, int size) { + static int[] buildInt(Node node, SnapiType resultType, int size) { return new int[size]; } @Specialization(guards = "isLongKind(resultType)") - static long[] buildLong(Node node, Rql2Type resultType, int size) { + static long[] buildLong(Node node, SnapiType resultType, int size) { return new long[size]; } @Specialization(guards = "isFloatKind(resultType)") - static float[] buildFloat(Node node, Rql2Type resultType, int size) { + static float[] buildFloat(Node node, SnapiType resultType, int size) { return new float[size]; } @Specialization(guards = "isDoubleKind(resultType)") - static double[] buildDouble(Node node, Rql2Type resultType, int size) { + static double[] buildDouble(Node node, SnapiType resultType, int size) { return new double[size]; } @Specialization(guards = "isBooleanKind(resultType)") - static boolean[] buildBoolean(Node node, Rql2Type resultType, int size) { + static boolean[] buildBoolean(Node node, SnapiType resultType, int size) { return new boolean[size]; } @Specialization(guards = "isStringKind(resultType)") - static String[] buildString(Node node, Rql2Type resultType, int size) { + static String[] buildString(Node node, SnapiType resultType, int size) { return new String[size]; } @Specialization - static Object[] buildObject(Node node, Rql2Type resultType, int size) { + static Object[] buildObject(Node node, SnapiType resultType, int size) { return new Object[size]; } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java index 0fa346d57..757b90b9a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionDistinctNode.java @@ -15,19 +15,19 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.iterable.operations.DistinctCollection; @NodeInfo(shortName = "Collection.Distinct") @NodeChild("input") -@NodeField(name = "valueType", type = Rql2TypeWithProperties.class) +@NodeField(name = "valueType", type = SnapiTypeWithProperties.class) @NodeField(name = "generatorSlot", type = int.class) @NodeField(name = "offHeapDistinctSlot", type = int.class) public abstract class CollectionDistinctNode extends ExpressionNode { @Idempotent - protected abstract Rql2TypeWithProperties getValueType(); + protected abstract SnapiTypeWithProperties getValueType(); @Idempotent protected abstract int getGeneratorSlot(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java index ef98fbc52..0b6afcdc8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionEquiJoinNode.java @@ -14,7 +14,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.iterable.operations.EquiJoinCollection; @@ -26,9 +26,9 @@ public class CollectionEquiJoinNode extends ExpressionNode { @Child private ExpressionNode rightKeyFun; @Child private ExpressionNode remapFun; - private final Rql2TypeWithProperties leftValueType; - private final Rql2TypeWithProperties rightValueType; - private final Rql2TypeWithProperties keyType; + private final SnapiTypeWithProperties leftValueType; + private final SnapiTypeWithProperties rightValueType; + private final SnapiTypeWithProperties keyType; private final int computeNextSlot; private final int shouldContinueSlot; @@ -41,9 +41,9 @@ public CollectionEquiJoinNode( ExpressionNode right, ExpressionNode leftKeyFun, ExpressionNode rightKeyFun, - Rql2TypeWithProperties keyType, - Rql2TypeWithProperties leftValueType, - Rql2TypeWithProperties rightValueType, + SnapiTypeWithProperties keyType, + SnapiTypeWithProperties leftValueType, + SnapiTypeWithProperties rightValueType, ExpressionNode remapFun, int computeNextSlot, int shouldContinueSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java index bfa52694c..67a435ff0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionGroupByNode.java @@ -15,25 +15,25 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.iterable.operations.GroupByCollection; @NodeInfo(shortName = "Collection.GroupBy") @NodeChild("iterable") @NodeChild("keyFun") -@NodeField(name = "keyType", type = Rql2TypeWithProperties.class) -@NodeField(name = "rowType", type = Rql2TypeWithProperties.class) +@NodeField(name = "keyType", type = SnapiTypeWithProperties.class) +@NodeField(name = "rowType", type = SnapiTypeWithProperties.class) @NodeField(name = "generatorSlot", type = int.class) @NodeField(name = "functionSlot", type = int.class) @NodeField(name = "mapSlot", type = int.class) public abstract class CollectionGroupByNode extends ExpressionNode { @Idempotent - protected abstract Rql2TypeWithProperties getKeyType(); + protected abstract SnapiTypeWithProperties getKeyType(); @Idempotent - protected abstract Rql2TypeWithProperties getRowType(); + protected abstract SnapiTypeWithProperties getRowType(); @Idempotent protected abstract int getGeneratorSlot(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java index 608499f6b..3fbdaf2e7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionJoinNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.generator.collection.StaticInitializers; import com.rawlabs.snapi.truffle.runtime.iterable.operations.JoinCollection; @@ -26,7 +26,7 @@ @NodeChild("right") @NodeChild("remap") @NodeChild("predicate") -@NodeField(name = "rightType", type = Rql2TypeWithProperties.class) +@NodeField(name = "rightType", type = SnapiTypeWithProperties.class) @NodeField(name = "reshapeBeforePredicate", type = Boolean.class) @NodeField(name = "computeNextSlot", type = int.class) @NodeField(name = "shouldContinueSlot", type = int.class) @@ -37,7 +37,7 @@ public abstract class CollectionJoinNode extends ExpressionNode { @Idempotent - protected abstract Rql2TypeWithProperties getRightType(); + protected abstract SnapiTypeWithProperties getRightType(); @Idempotent protected abstract Boolean getReshapeBeforePredicate(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java index 457a5fb97..2d9f0fc00 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionOrderByNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.iterable.operations.OrderByCollection; @@ -26,8 +26,8 @@ public class CollectionOrderByNode extends ExpressionNode { @Child private ExpressionNode input; @Children private final ExpressionNode[] keyFuns; @Children private final ExpressionNode[] orderings; - private final Rql2TypeWithProperties[] keyTypes; - private final Rql2TypeWithProperties valueType; + private final SnapiTypeWithProperties[] keyTypes; + private final SnapiTypeWithProperties valueType; private final int generatorSlot; private final int collectionSlot; private final int offHeapGroupByKeysSlot; @@ -36,8 +36,8 @@ public CollectionOrderByNode( ExpressionNode input, ExpressionNode[] keyFuns, ExpressionNode[] orderings, - Rql2TypeWithProperties[] keyTypes, - Rql2TypeWithProperties valueType, + SnapiTypeWithProperties[] keyTypes, + SnapiTypeWithProperties valueType, int generatorSlot, int collectionSlot, int offHeapGroupByKeysSlot) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java index 333aba981..1e607ca9e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionTupleAvgNode.java @@ -14,7 +14,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.*; import com.rawlabs.snapi.truffle.runtime.primitives.DecimalObject; @@ -42,7 +42,7 @@ public CollectionTupleAvgNode(ExpressionNode iterableNode, int generatorSlot, in public Object executeGeneric(VirtualFrame virtualFrame) { Object[] results = (Object[]) aggregate.executeGeneric(virtualFrame); - Object record = Rql2Language.get(this).createPureRecord(); + Object record = SnapiLanguage.get(this).createPureRecord(); if ((long) results[1] == (long) zeroNode.execute(this, Aggregations.COUNT)) { addPropNode.execute(this, record, "sum", zeroNode.execute(this, Aggregations.SUM), false); } else { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java index 24a676ba0..65888d858 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/collection/CollectionZipNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.dsl.NodeChild; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.iterable.operations.ZipCollection; @@ -25,7 +25,7 @@ public abstract class CollectionZipNode extends ExpressionNode { @Specialization protected Object doZip(Object iterable1, Object iterable2) { - Rql2Language language = Rql2Language.get(this); + SnapiLanguage language = SnapiLanguage.get(this); return new ZipCollection(iterable1, iterable2, language); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java index 50d3db740..331512b24 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListBuildNode.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; import com.rawlabs.snapi.truffle.runtime.list.*; @@ -37,8 +37,8 @@ public ListBuildNode(Type type, ExpressionNode[] exps) { @ExplodeLoop public Object executeGeneric(VirtualFrame frame) { - Rql2ListType rql2Type = (Rql2ListType) type; - Rql2TypeWithProperties innerType = (Rql2TypeWithProperties) rql2Type.innerType(); + SnapiListType snapiType = (SnapiListType) type; + SnapiTypeWithProperties innerType = (SnapiTypeWithProperties) snapiType.innerType(); try { if (!innerType.props().isEmpty()) { @@ -49,56 +49,56 @@ public Object executeGeneric(VirtualFrame frame) { return new ObjectList(values); } switch (innerType) { - case Rql2ByteType rql2ByteType -> { + case SnapiByteType snapiByteType -> { byte[] values = new byte[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeByte(frame); } return new ByteList(values); } - case Rql2ShortType rql2ShortType -> { + case SnapiShortType snapiShortType -> { short[] values = new short[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeShort(frame); } return new ShortList(values); } - case Rql2IntType rql2IntType -> { + case SnapiIntType snapiIntType -> { int[] values = new int[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeInt(frame); } return new IntList(values); } - case Rql2LongType rql2LongType -> { + case SnapiLongType snapiLongType -> { long[] values = new long[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeLong(frame); } return new LongList(values); } - case Rql2FloatType rql2FloatType -> { + case SnapiFloatType snapiFloatType -> { float[] values = new float[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeFloat(frame); } return new FloatList(values); } - case Rql2DoubleType rql2DoubleType -> { + case SnapiDoubleType snapiDoubleType -> { double[] values = new double[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeDouble(frame); } return new DoubleList(values); } - case Rql2BoolType rql2BoolType -> { + case SnapiBoolType snapiBoolType -> { boolean[] values = new boolean[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeBoolean(frame); } return new BooleanList(values); } - case Rql2StringType rql2StringType -> { + case SnapiStringType snapiStringType -> { String[] values = new String[exps.length]; for (int i = 0; i < exps.length; i++) { values[i] = exps[i].executeString(frame); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java index 021506401..c9f8d0bb4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFilterNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; @@ -63,7 +63,7 @@ public class ListFilterNode extends ExpressionNode { ArrayOperationNodes.ArrayBuildListNode arrayBuildListNode = ArrayOperationNodesFactory.ArrayBuildListNodeGen.create(); - private final Rql2Type resultType; + private final SnapiType resultType; private final int generatorSlot; private final int functionSlot; @@ -75,7 +75,7 @@ public class ListFilterNode extends ExpressionNode { public ListFilterNode( ExpressionNode listNode, ExpressionNode functionNode, - Rql2Type resultType, + SnapiType resultType, int generatorSlot, int functionSlot, int listSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java index 32f36b75f..1832371ae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.TypeGuards; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; @@ -61,7 +61,7 @@ public class ListFromNode extends ExpressionNode { private ArrayOperationNodes.ArrayBuildListNode arrayBuildListNode = ArrayOperationNodesFactory.ArrayBuildListNodeGen.create(); - private final Rql2Type resultType; + private final SnapiType resultType; private final int generatorSlot; private final int listSlot; @@ -71,7 +71,7 @@ public class ListFromNode extends ExpressionNode { public ListFromNode( ExpressionNode iterableNode, - Rql2Type resultType, + SnapiType resultType, int generatorSlot, int listSlot, int currentIdxSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java index c068d03c2..d6723cd3f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListFromUnsafe.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; @@ -58,7 +58,7 @@ public class ListFromUnsafe extends ExpressionNode { private ArrayOperationNodes.ArrayBuildListNode arrayBuildListNode = ArrayOperationNodesFactory.ArrayBuildListNodeGen.create(); - private final Rql2Type resultType; + private final SnapiType resultType; private final int generatorSlot; private final int listSlot; @@ -68,7 +68,7 @@ public class ListFromUnsafe extends ExpressionNode { public ListFromUnsafe( ExpressionNode iterableNode, - Rql2Type resultType, + SnapiType resultType, int generatorSlot, int listSlot, int currentIdxSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java index 1dd8559f9..6a69bfe8b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListGroupByNode.java @@ -18,7 +18,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.osr.OSRGeneratorNode; import com.rawlabs.snapi.truffle.ast.osr.bodies.OSRListEquiJoinInitBodyNode; @@ -64,8 +64,8 @@ public class ListGroupByNode extends ExpressionNode { OffHeapNodes.OffHeapGeneratorNode generatorNode = OffHeapNodesFactory.OffHeapGeneratorNodeGen.create(); - private final Rql2TypeWithProperties rowType; - private final Rql2TypeWithProperties keyType; + private final SnapiTypeWithProperties rowType; + private final SnapiTypeWithProperties keyType; private final int generatorSlot; private final int keyFunctionSlot; @@ -78,8 +78,8 @@ public class ListGroupByNode extends ExpressionNode { public ListGroupByNode( ExpressionNode inputNode, ExpressionNode keyFunNode, - Rql2TypeWithProperties rowType, - Rql2TypeWithProperties keyType, + SnapiTypeWithProperties rowType, + SnapiTypeWithProperties keyType, int generatorSlot, int keyFunctionSlot, int mapSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java index c6c4e9fd5..885542d34 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/iterable/list/ListTransformNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; @@ -42,7 +42,7 @@ public class ListTransformNode extends ExpressionNode { @Child private ListNodes.SizeNode sizeNode = ListNodesFactory.SizeNodeGen.create(); - private final Rql2Type resultType; + private final SnapiType resultType; private final int currentIndexSlot; private final int listSizeSlot; @@ -53,7 +53,7 @@ public class ListTransformNode extends ExpressionNode { public ListTransformNode( ExpressionNode listNode, ExpressionNode functionNode, - Rql2Type resultType, + SnapiType resultType, int listSlot, int functionSlot, int currentIndexSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java index 3773c4ce6..d2b968b49 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/LocationConstNode.java @@ -14,8 +14,8 @@ import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription$; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.primitives.LocationObject; import com.rawlabs.utils.core.RawSettings; @@ -33,7 +33,7 @@ public LocationConstNode(byte[] value, String publicDescription) { @Override public final Object executeGeneric(VirtualFrame virtualFrame) { - RawSettings rawSettings = Rql2Context.get(this).getSettings(); + RawSettings rawSettings = SnapiContext.get(this).getSettings(); Location location = getLocation(rawSettings); return new LocationObject(location, publicDescription); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java index dacb88809..541d327e7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/literals/ZeroedConstNode.java @@ -13,27 +13,27 @@ package com.rawlabs.snapi.truffle.ast.expressions.literals; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; public class ZeroedConstNode extends ExpressionNode { - Rql2Type type; + SnapiType type; - public ZeroedConstNode(Rql2Type type) { + public ZeroedConstNode(SnapiType type) { this.type = type; } @Override public final Object executeGeneric(VirtualFrame virtualFrame) { return switch (this.type) { - case Rql2ByteType rql2ByteType -> (byte) 0; - case Rql2ShortType rql2ShortType -> (short) 0; - case Rql2IntType rql2IntType -> 0; - case Rql2LongType rql2LongType -> (long) 0; - case Rql2FloatType rql2FloatType -> (float) 0; - case Rql2DoubleType rql2DoubleType -> (double) 0; - case Rql2BoolType rql2BoolType -> false; + case SnapiByteType snapiByteType -> (byte) 0; + case SnapiShortType snapiShortType -> (short) 0; + case SnapiIntType snapiIntType -> 0; + case SnapiLongType snapiLongType -> (long) 0; + case SnapiFloatType snapiFloatType -> (float) 0; + case SnapiDoubleType snapiDoubleType -> (double) 0; + case SnapiBoolType snapiBoolType -> false; case null, default -> null; }; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java index c2fe8f70f..7a81df6fb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordAddFieldNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.ArrayList; @@ -40,7 +40,7 @@ protected static Object doAddField( String newKey, Object newValue, @Bind("$node") Node thisNode, - @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) Rql2Language lang, + @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) SnapiLanguage lang, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode, @Cached(value = "getKeysNode.execute(thisNode, rec)", neverDefault = true, dimensions = 1) Object[] objKeys, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java index 161e4476a..cf5fa2740 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordBuildNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; @@ -33,7 +33,7 @@ public class RecordBuildNode extends ExpressionNode { private final boolean hasDuplicateKeys; - private final Rql2Language language = Rql2Language.get(this); + private final SnapiLanguage language = SnapiLanguage.get(this); public RecordBuildNode(ExpressionNode[] elementsNodes, String[] keys) { CompilerAsserts.compilationConstant(elementsNodes.length); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java index 4e16f606f..c1568b24d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordConcatNode.java @@ -16,7 +16,7 @@ import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.ArrayList; @@ -40,7 +40,7 @@ protected static Object doConcat( Object rec1, Object rec2, @Bind("$node") Node thisNode, - @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) Rql2Language lang, + @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) SnapiLanguage lang, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode1, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode2, @Cached(value = "getKeysNode1.execute(thisNode, rec1)", neverDefault = true, dimensions = 1) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java index 8bd65554c..256ddc792 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordRemoveFieldNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import java.util.ArrayList; @@ -38,7 +38,7 @@ protected static Object doRemoveField( Object record, Object dropKey, @Bind("$node") Node thisNode, - @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) Rql2Language lang, + @Cached(value = "getCachedLanguage(thisNode)", neverDefault = true) SnapiLanguage lang, @Cached(inline = true) RecordNodes.GetKeysNode getKeysNode, @Cached(value = "getKeysNode.execute(thisNode, record)", neverDefault = true, dimensions = 1) Object[] objKeys, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java index 60ef5ed40..a256f0523 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/expressions/record/RecordStaticInitializers.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.ast.expressions.record; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; import com.rawlabs.snapi.truffle.runtime.record.RecordNodesFactory; import java.util.ArrayList; @@ -21,8 +21,8 @@ public class RecordStaticInitializers { - public static Rql2Language getCachedLanguage(Node node) { - return Rql2Language.get(node); + public static SnapiLanguage getCachedLanguage(Node node) { + return SnapiLanguage.get(node); } public static boolean hasDuplicateKeys(Object[] keys) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java index 12b10c61e..ba50feeda 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/binary/BinaryWriterNode.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; import com.rawlabs.snapi.truffle.ast.StatementNode; @@ -28,7 +28,7 @@ public class BinaryWriterNode extends StatementNode { @Child private DirectCallNode innerWriter; - private final OutputStream os = Rql2Context.get(this).getOutput(); + private final OutputStream os = SnapiContext.get(this).getOutput(); public BinaryWriterNode(ExpressionNode binaryNode, ProgramStatementNode innerWriter) { this.innerWriter = DirectCallNode.create(innerWriter.getCallTarget()); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java index 6a989bbd3..011ad5a41 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/RecordParseCsvNode.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.SnapiAttrType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; @@ -32,12 +32,12 @@ public class RecordParseCsvNode extends ExpressionNode { @Children private final DirectCallNode[] childDirectCalls; - private final Rql2AttrType[] columns; + private final SnapiAttrType[] columns; private final boolean hasDuplicateKeys; - private final Rql2Language language = Rql2Language.get(this); + private final SnapiLanguage language = SnapiLanguage.get(this); - public RecordParseCsvNode(ProgramExpressionNode[] columnParsers, Rql2AttrType[] columns) { + public RecordParseCsvNode(ProgramExpressionNode[] columnParsers, SnapiAttrType[] columns) { this.columns = columns; this.childDirectCalls = new DirectCallNode[columnParsers.length]; for (int i = 0; i < columnParsers.length; i++) { @@ -48,7 +48,7 @@ public RecordParseCsvNode(ProgramExpressionNode[] columnParsers, Rql2AttrType[] addPropNode[i] = RecordNodesFactory.AddPropNodeGen.create(); } - List keys = Arrays.stream(columns).map(Rql2AttrType::idn).toList(); + List keys = Arrays.stream(columns).map(SnapiAttrType::idn).toList(); hasDuplicateKeys = keys.size() != keys.stream().distinct().count(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java index 273fbbe17..82ce1d3b2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/reader/parser/TruffleCsvParser.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.dataformat.csv.CsvSchema; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.TruffleLogger; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; @@ -127,7 +127,7 @@ public void finishLine(ExpressionNode location) { } private static final TruffleLogger LOG = - TruffleLogger.getLogger(Rql2Language.ID, TruffleRuntimeException.class); + TruffleLogger.getLogger(SnapiLanguage.ID, TruffleRuntimeException.class); @TruffleBoundary public void close() { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java index f038fde46..374365463 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvIterableWriterNode.java @@ -22,7 +22,7 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.StatementNode; import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; @@ -62,7 +62,7 @@ public class CsvIterableWriterNode extends StatementNode { private final String[] columnNames; private final String lineSeparator; - private final OutputStream os = Rql2Context.get(this).getOutput(); + private final OutputStream os = SnapiContext.get(this).getOutput(); public CsvIterableWriterNode( ExpressionNode dataNode, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java index 7e4e8615b..a3097661a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/csv/writer/CsvListWriterNode.java @@ -22,7 +22,7 @@ import com.oracle.truffle.api.RootCallTarget; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.DirectCallNode; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.StatementNode; import com.rawlabs.snapi.truffle.runtime.exceptions.csv.CsvWriterTruffleException; @@ -55,7 +55,7 @@ public CsvListWriterNode( itemWriter = DirectCallNode.create(writeRootCallTarget); this.columnNames = columnNames; this.lineSeparator = lineSeparator; - this.os = Rql2Context.get(this).getOutput(); + this.os = SnapiContext.get(this).getOutput(); } @Override diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java index ec73e727d..dc1e575bf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/jdbc/RecordReadJdbcQuery.java @@ -16,8 +16,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.SnapiAttrType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; @@ -32,13 +32,13 @@ public class RecordReadJdbcQuery extends ExpressionNode { @Children private final RecordNodes.AddPropNode[] addPropNode; - private final Rql2AttrType[] columns; + private final SnapiAttrType[] columns; - private final Rql2Language language = Rql2Language.get(this); + private final SnapiLanguage language = SnapiLanguage.get(this); private final boolean hasDuplicateKeys; - public RecordReadJdbcQuery(ProgramExpressionNode[] columnParsers, Rql2AttrType[] columns) { + public RecordReadJdbcQuery(ProgramExpressionNode[] columnParsers, SnapiAttrType[] columns) { this.columns = columns; this.childDirectCalls = new DirectCallNode[columnParsers.length]; for (int i = 0; i < columnParsers.length; i++) { @@ -48,7 +48,7 @@ public RecordReadJdbcQuery(ProgramExpressionNode[] columnParsers, Rql2AttrType[] for (int i = 0; i < columns.length; i++) { addPropNode[i] = RecordNodesFactory.AddPropNodeGen.create(); } - List listOfKeys = Arrays.stream(columns).map(Rql2AttrType::idn).toList(); + List listOfKeys = Arrays.stream(columns).map(SnapiAttrType::idn).toList(); hasDuplicateKeys = listOfKeys.size() != listOfKeys.stream().distinct().count(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java index d56eaa06e..70f08eed9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/JsonParserNodes.java @@ -22,7 +22,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.DateTimeFormatCache; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalNodes; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordStaticInitializers; @@ -47,7 +47,7 @@ public final class JsonParserNodes { private static final TruffleLogger LOG = - TruffleLogger.getLogger(Rql2Language.ID, TruffleRuntimeException.class); + TruffleLogger.getLogger(SnapiLanguage.ID, TruffleRuntimeException.class); @NodeInfo(shortName = "JsonParser.Initialize") @GenerateUncached @@ -633,7 +633,7 @@ protected static Object doParse( Node node, JsonParser parser, @Bind("$node") Node thisNode, - @Cached("getCachedLanguage(thisNode)") Rql2Language lang, + @Cached("getCachedLanguage(thisNode)") SnapiLanguage lang, @Cached(inline = false) @Cached.Shared("parseAny") ParseAnyJsonParserNode parse, @Cached @Cached.Shared("nextToken") JsonParserNodes.NextTokenJsonParserNode nextToken, @Cached @Cached.Shared("currentToken") @@ -649,7 +649,7 @@ protected static Object doParse( nextToken.execute(thisNode, parser); - Object record = Rql2Language.get(thisNode).createDuplicateKeyRecord(); + Object record = SnapiLanguage.get(thisNode).createDuplicateKeyRecord(); while (currentToken.execute(thisNode, parser) != JsonToken.END_OBJECT) { String fieldName = currentField.execute(thisNode, parser); nextToken.execute(thisNode, parser); // skip the field name diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java index 80fdfc631..cde870884 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/ListParseJsonNode.java @@ -19,7 +19,7 @@ import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodes; import com.rawlabs.snapi.truffle.ast.expressions.iterable.ArrayOperationNodesFactory; @@ -56,7 +56,7 @@ public class ListParseJsonNode extends ExpressionNode { private ArrayOperationNodes.ArrayBuildNode arrayBuildNode = ArrayOperationNodesFactory.ArrayBuildNodeGen.create(); - private final Rql2Type resultType; + private final SnapiType resultType; private final int currentIdxSlot; private final int listSizeSlot; @@ -66,7 +66,7 @@ public class ListParseJsonNode extends ExpressionNode { private final int parserSlot; public ListParseJsonNode( - Rql2Type resultType, + SnapiType resultType, RootCallTarget childCallTarget, int parserSlot, int llistSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java index 08ddd85a3..2823cca72 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/json/reader/parser/RecordParseJsonNode.java @@ -22,9 +22,9 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsNullableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.TruffleBoundaries; @@ -65,16 +65,16 @@ public class RecordParseJsonNode extends ExpressionNode { // Field name and its index in the childDirectCalls array private final LinkedHashMap fieldNamesMap; private final int fieldsSize; - private final Rql2TypeWithProperties[] fieldTypes; + private final SnapiTypeWithProperties[] fieldTypes; - private final Rql2Language language = Rql2Language.get(this); + private final SnapiLanguage language = SnapiLanguage.get(this); private final boolean hasDuplicateKeys; public RecordParseJsonNode( ProgramExpressionNode[] childProgramExpressionNode, LinkedHashMap fieldNamesMap, - Rql2TypeWithProperties[] fieldTypes, + SnapiTypeWithProperties[] fieldTypes, boolean hasDuplicateKeys) { this.fieldTypes = fieldTypes; this.fieldNamesMap = fieldNamesMap; @@ -168,6 +168,6 @@ private String[] getKeySet() { @CompilerDirectives.TruffleBoundary private boolean propsContainNullable(int index) { - return fieldTypes[index].props().contains(Rql2IsNullableTypeProperty.apply()); + return fieldTypes[index].props().contains(SnapiIsNullableTypeProperty.apply()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java index ef5455214..2628ecd28 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoFromNode.java @@ -14,7 +14,7 @@ import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodesFactory; @@ -23,9 +23,9 @@ public class KryoFromNode extends ExpressionNode { @Child private ExpressionNode valueNode; @Child private KryoNodes.KryoReadNode reader = KryoNodesFactory.KryoReadNodeGen.create(); - private final Rql2TypeWithProperties t; + private final SnapiTypeWithProperties t; - public KryoFromNode(ExpressionNode valueNode, Rql2TypeWithProperties t) { + public KryoFromNode(ExpressionNode valueNode, SnapiTypeWithProperties t) { this.valueNode = valueNode; this.t = t; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java index 10ee1b40e..3b3bb54cd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/kryo/KryoWriteNode.java @@ -14,7 +14,7 @@ import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodesFactory; @@ -23,9 +23,9 @@ public class KryoWriteNode extends ExpressionNode { @Child private ExpressionNode valueNode; @Child private KryoNodes.KryoWriteNode writer = KryoNodesFactory.KryoWriteNodeGen.create(); - private final Rql2TypeWithProperties t; + private final SnapiTypeWithProperties t; - public KryoWriteNode(ExpressionNode valueNode, Rql2TypeWithProperties t) { + public KryoWriteNode(ExpressionNode valueNode, SnapiTypeWithProperties t) { this.valueNode = valueNode; this.t = t; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java index cc8bd8d46..81fa8a49f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/io/xml/parser/RecordParseXmlNode.java @@ -19,8 +19,8 @@ import com.oracle.truffle.api.nodes.DirectCallNode; import com.oracle.truffle.api.nodes.NodeInfo; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.runtime.exceptions.xml.XmlParserTruffleException; @@ -40,7 +40,7 @@ public class RecordParseXmlNode extends ExpressionNode { // Field name and its index in the childDirectCalls array private final int fieldsSize; private final String[] fields; - private final Rql2TypeWithProperties[] fieldTypes; + private final SnapiTypeWithProperties[] fieldTypes; private final Map> collectionValues = new HashMap<>(); private final Map fieldsIndex = new HashMap<>(); private final Map attributesIndex = new HashMap<>(); @@ -49,12 +49,12 @@ public class RecordParseXmlNode extends ExpressionNode { private final BitSet bitSet; private final boolean hasDuplicateKeys; - private final Rql2Language language = Rql2Language.get(this); + private final SnapiLanguage language = SnapiLanguage.get(this); public RecordParseXmlNode( ProgramExpressionNode[] childProgramExpressionNode, String[] fieldNames, - Rql2TypeWithProperties[] fieldTypes) { + SnapiTypeWithProperties[] fieldTypes) { this.fieldTypes = fieldTypes; this.fields = fieldNames; this.fieldsSize = childProgramExpressionNode.length; @@ -73,7 +73,7 @@ public RecordParseXmlNode( } // take note of fields that should be parsed as collections Type fieldType = fieldTypes[index]; - if (fieldType instanceof Rql2IterableType || fieldType instanceof Rql2ListType) { + if (fieldType instanceof SnapiIterableType || fieldType instanceof SnapiListType) { collectionsIndex.put(fieldName, index); refBitSet.set(index); } @@ -149,7 +149,7 @@ record = language.createPureRecord(); ObjectList list = new ObjectList(items.toArray()); int index = collectionsIndex.get(keys[i]); Type fieldType = fieldTypes[index]; - if (fieldType instanceof Rql2IterableType) { + if (fieldType instanceof SnapiIterableType) { // if the collection is an iterable, convert the list to an iterable. addPropNode[i].execute(this, record, keys[i], list.toIterable(), hasDuplicateKeys); } else { @@ -165,7 +165,7 @@ record = language.createPureRecord(); for (int i = 0; i < fieldsSize; i++) { String fieldName = fields[i]; if (!bitSet.get(i)) { - if (fieldTypes[i].props().contains(Rql2IsNullableTypeProperty.apply())) { + if (fieldTypes[i].props().contains(SnapiIsNullableTypeProperty.apply())) { // It's OK, the field is nullable. If it's tryable, make a success null, // else a plain // null. diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java index e37da7c11..cc2ada60f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadClosureVariableNode.java @@ -20,8 +20,8 @@ import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.TypeGuards; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; @@ -29,11 +29,11 @@ @ImportStatic(TypeGuards.class) @NodeField(name = "depth", type = Integer.class) @NodeField(name = "index", type = Integer.class) -@NodeField(name = "rql2Type", type = Rql2Type.class) +@NodeField(name = "snapiType", type = SnapiType.class) public abstract class ReadClosureVariableNode extends ExpressionNode { private static final TruffleLogger LOG = - TruffleLogger.getLogger(Rql2Language.ID, TruffleRuntimeException.class); + TruffleLogger.getLogger(SnapiLanguage.ID, TruffleRuntimeException.class); @Idempotent protected abstract Integer getDepth(); @@ -42,39 +42,39 @@ public abstract class ReadClosureVariableNode extends ExpressionNode { protected abstract Integer getIndex(); @Idempotent - protected abstract Rql2Type getRql2Type(); + protected abstract SnapiType getSnapiType(); - @Specialization(guards = "isBooleanKind(getRql2Type())") + @Specialization(guards = "isBooleanKind(getSnapiType())") protected final boolean doBoolean(VirtualFrame frame) { return findActualFrame(frame).getBoolean(getIndex()); } - @Specialization(guards = "isByteKind(getRql2Type())") + @Specialization(guards = "isByteKind(getSnapiType())") protected final byte doByte(VirtualFrame frame) { return findActualFrame(frame).getByte(getIndex()); } - @Specialization(guards = "isShortKind(getRql2Type())") + @Specialization(guards = "isShortKind(getSnapiType())") protected final short doShort(VirtualFrame frame) { return (short) findActualFrame(frame).getInt(getIndex()); } - @Specialization(guards = "isIntKind(getRql2Type())") + @Specialization(guards = "isIntKind(getSnapiType())") protected final int doInt(VirtualFrame frame) { return findActualFrame(frame).getInt(getIndex()); } - @Specialization(guards = "isLongKind(getRql2Type())") + @Specialization(guards = "isLongKind(getSnapiType())") protected final long doLong(VirtualFrame frame) { return findActualFrame(frame).getLong(getIndex()); } - @Specialization(guards = "isFloatKind(getRql2Type())") + @Specialization(guards = "isFloatKind(getSnapiType())") protected final float doFloat(VirtualFrame frame) { return findActualFrame(frame).getFloat(getIndex()); } - @Specialization(guards = "isDoubleKind(getRql2Type())") + @Specialization(guards = "isDoubleKind(getSnapiType())") protected final double doDouble(VirtualFrame frame) { return findActualFrame(frame).getDouble(getIndex()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java index ae2b78036..085d5cf7f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/ReadLocalVariableNode.java @@ -17,52 +17,52 @@ import com.oracle.truffle.api.dsl.NodeField; import com.oracle.truffle.api.dsl.Specialization; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.TypeGuards; @ImportStatic(TypeGuards.class) @NodeField(name = "slot", type = int.class) -@NodeField(name = "rql2Type", type = Rql2Type.class) +@NodeField(name = "snapiType", type = SnapiType.class) public abstract class ReadLocalVariableNode extends ExpressionNode { @Idempotent protected abstract int getSlot(); @Idempotent - protected abstract Rql2Type getRql2Type(); + protected abstract SnapiType getSnapiType(); - @Specialization(guards = "isBooleanKind(getRql2Type())") + @Specialization(guards = "isBooleanKind(getSnapiType())") protected final boolean doBoolean(VirtualFrame frame) { return frame.getBoolean(getSlot()); } - @Specialization(guards = "isByteKind(getRql2Type())") + @Specialization(guards = "isByteKind(getSnapiType())") protected final byte doByte(VirtualFrame frame) { return frame.getByte(getSlot()); } - @Specialization(guards = "isShortKind(getRql2Type())") + @Specialization(guards = "isShortKind(getSnapiType())") protected final short doShort(VirtualFrame frame) { return (short) frame.getInt(getSlot()); } - @Specialization(guards = "isIntKind(getRql2Type())") + @Specialization(guards = "isIntKind(getSnapiType())") protected final int doInt(VirtualFrame frame) { return frame.getInt(getSlot()); } - @Specialization(guards = "isLongKind(getRql2Type())") + @Specialization(guards = "isLongKind(getSnapiType())") protected final long doLong(VirtualFrame frame) { return frame.getLong(getSlot()); } - @Specialization(guards = "isFloatKind(getRql2Type())") + @Specialization(guards = "isFloatKind(getSnapiType())") protected final float doFloat(VirtualFrame frame) { return frame.getFloat(getSlot()); } - @Specialization(guards = "isDoubleKind(getRql2Type())") + @Specialization(guards = "isDoubleKind(getSnapiType())") protected final double doDouble(VirtualFrame frame) { return frame.getDouble(getSlot()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java index edb7b7069..e8531bc26 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/local/WriteLocalVariableNode.java @@ -15,30 +15,30 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.TypeGuards; @ImportStatic(TypeGuards.class) @NodeChild("value") @NodeField(name = "slot", type = int.class) -@NodeField(name = "rql2Type", type = Rql2Type.class) +@NodeField(name = "snapiType", type = SnapiType.class) public abstract class WriteLocalVariableNode extends ExpressionNode { @Idempotent protected abstract int getSlot(); @Idempotent - protected abstract Rql2Type getRql2Type(); + protected abstract SnapiType getSnapiType(); - @Specialization(guards = "isBooleanKind(getRql2Type())") + @Specialization(guards = "isBooleanKind(getSnapiType())") protected final boolean doBoolean(VirtualFrame frame, boolean value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Boolean); frame.setBoolean(getSlot(), value); return value; } - @Specialization(guards = "isByteKind(getRql2Type())") + @Specialization(guards = "isByteKind(getSnapiType())") protected final byte doByte(VirtualFrame frame, byte value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Byte); @@ -46,7 +46,7 @@ protected final byte doByte(VirtualFrame frame, byte value) { return value; } - @Specialization(guards = "isShortKind(getRql2Type())") + @Specialization(guards = "isShortKind(getSnapiType())") protected final short doShort(VirtualFrame frame, short value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Int); @@ -54,7 +54,7 @@ protected final short doShort(VirtualFrame frame, short value) { return value; } - @Specialization(guards = "isIntKind(getRql2Type())") + @Specialization(guards = "isIntKind(getSnapiType())") protected final int doInt(VirtualFrame frame, int value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Int); @@ -62,7 +62,7 @@ protected final int doInt(VirtualFrame frame, int value) { return value; } - @Specialization(guards = "isLongKind(getRql2Type())") + @Specialization(guards = "isLongKind(getSnapiType())") protected final long doLong(VirtualFrame frame, long value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Long); @@ -70,7 +70,7 @@ protected final long doLong(VirtualFrame frame, long value) { return value; } - @Specialization(guards = "isFloatKind(getRql2Type())") + @Specialization(guards = "isFloatKind(getSnapiType())") protected final float doFloat(VirtualFrame frame, float value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Float); @@ -78,7 +78,7 @@ protected final float doFloat(VirtualFrame frame, float value) { return value; } - @Specialization(guards = "isDoubleKind(getRql2Type())") + @Specialization(guards = "isDoubleKind(getSnapiType())") protected final double doDouble(VirtualFrame frame, double value) { frame.getFrameDescriptor().setSlotKind(getSlot(), FrameSlotKind.Double); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java index 5a1761e32..1c995e5a3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/ast/osr/bodies/OSRToArrayBodyNode.java @@ -13,14 +13,14 @@ package com.rawlabs.snapi.truffle.ast.osr.bodies; import com.oracle.truffle.api.frame.VirtualFrame; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.TypeGuards; import java.util.ArrayList; public class OSRToArrayBodyNode extends ExpressionNode { - private final Rql2Type resultType; + private final SnapiType resultType; private final int listSlot; @@ -28,7 +28,8 @@ public class OSRToArrayBodyNode extends ExpressionNode { private final int resultSlot; - public OSRToArrayBodyNode(Rql2Type resultType, int listSlot, int currentIdxSlot, int resultSlot) { + public OSRToArrayBodyNode( + SnapiType resultType, int listSlot, int currentIdxSlot, int resultSlot) { this.resultType = resultType; this.currentIdxSlot = currentIdxSlot; this.resultSlot = resultSlot; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java index ae8c9ea68..4622511af 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/SnapiTruffleEmitter.java @@ -20,16 +20,16 @@ import org.bitbucket.inkytonik.kiama.relation.TreeRelation; import org.bitbucket.inkytonik.kiama.util.Entity; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.source.Exp; -import com.rawlabs.snapi.frontend.rql2.source.IdnExp; -import com.rawlabs.snapi.frontend.rql2.source.SourceNode; -import com.rawlabs.snapi.frontend.rql2.*; -import com.rawlabs.snapi.frontend.rql2.extensions.EntryExtension; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.Exp; +import com.rawlabs.snapi.frontend.snapi.source.IdnExp; +import com.rawlabs.snapi.frontend.snapi.source.SourceNode; +import com.rawlabs.snapi.frontend.snapi.*; +import com.rawlabs.snapi.frontend.snapi.extensions.EntryExtension; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.emitter.builtin.location_extension.TruffleLocationFromStringEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.StatementNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.controlflow.ExpBlockNode; @@ -56,7 +56,7 @@ public class SnapiTruffleEmitter extends TruffleEmitter { private final Tree tree; - private final Rql2Language rawLanguage; + private final SnapiLanguage rawLanguage; private final ProgramContext programContext; private final SemanticAnalyzer analyzer; private final String uniqueId = UUID.randomUUID().toString().replace("-", "").replace("_", ""); @@ -316,7 +316,7 @@ private static TruffleEntryExtension getEntry(String pkgName, String entName) { throw new TruffleInternalErrorException("Could not find entry for " + pkgName + "." + entName); } - public SnapiTruffleEmitter(Tree tree, Rql2Language rawLanguage, ProgramContext programContext) { + public SnapiTruffleEmitter(Tree tree, SnapiLanguage rawLanguage, ProgramContext programContext) { this.tree = tree; this.analyzer = tree.analyzer(); this.rawLanguage = rawLanguage; @@ -327,7 +327,7 @@ private Type tipe(Exp e) { return analyzer.tipe(e); } - public Rql2Language getLanguage() { + public SnapiLanguage getLanguage() { return this.rawLanguage; } @@ -366,7 +366,7 @@ private void addSlot(Entity entity, String slot) { slotMapScope.get(0).put(entity, slot); } - protected StatementNode emitMethod(Rql2Method m) { + protected StatementNode emitMethod(SnapiMethod m) { Entity entity = analyzer.entity().apply(m.i()); FunProto fp = m.p(); Function f = recurseFunProto(fp); @@ -403,49 +403,49 @@ private StatementNode recurseLetDecl(LetDecl ld) { return switch (ld) { case LetBind lb -> { Entity entity = analyzer.entity().apply(lb.i()); - Rql2Type rql2Type = (Rql2Type) tipe(lb.e()); - int slot = switch (rql2Type) { - case Rql2UndefinedType ignored -> + SnapiType snapiType = (SnapiType) tipe(lb.e()); + int slot = switch (snapiType) { + case SnapiUndefinedType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); case ExpType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2ByteType ignored -> + case SnapiByteType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Byte, getIdnName(entity), null); - case Rql2ShortType ignored -> + case SnapiShortType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Int, getIdnName(entity), null); - case Rql2IntType ignored -> + case SnapiIntType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Int, getIdnName(entity), null); - case Rql2LongType ignored -> + case SnapiLongType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Long, getIdnName(entity), null); - case Rql2FloatType ignored -> + case SnapiFloatType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Float, getIdnName(entity), null); - case Rql2DoubleType ignored -> + case SnapiDoubleType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Double, getIdnName(entity), null); - case Rql2DecimalType ignored -> + case SnapiDecimalType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2BoolType ignored -> + case SnapiBoolType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Boolean, getIdnName(entity), null); - case Rql2StringType ignored -> + case SnapiStringType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2DateType ignored -> + case SnapiDateType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2TimeType ignored -> + case SnapiTimeType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2TimestampType ignored -> + case SnapiTimestampType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2IntervalType ignored -> + case SnapiIntervalType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2BinaryType ignored -> + case SnapiBinaryType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2IterableType ignored -> + case SnapiIterableType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2ListType ignored -> + case SnapiListType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); case FunType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2RecordType ignored -> + case SnapiRecordType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); - case Rql2LocationType ignored -> + case SnapiLocationType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); case PackageType ignored -> getFrameDescriptorBuilder().addSlot(FrameSlotKind.Object, getIdnName(entity), null); @@ -454,7 +454,7 @@ private StatementNode recurseLetDecl(LetDecl ld) { default -> throw new TruffleInternalErrorException(); }; addSlot(entity, Integer.toString(slot)); - yield WriteLocalVariableNodeGen.create(recurseExp(lb.e()), slot, rql2Type); + yield WriteLocalVariableNodeGen.create(recurseExp(lb.e()), slot, snapiType); } case LetFun lf -> { Entity entity = analyzer.entity().apply(lf.i()); @@ -529,8 +529,8 @@ public ClosureNode recurseLambda(TruffleBuildBody truffleBuildBody) { public ExpressionNode recurseExp(Exp in) { return switch (in) { case Exp ignored when tipe(in) instanceof PackageType || tipe(in) instanceof PackageEntryType -> - new ZeroedConstNode(Rql2ByteType.apply(new scala.collection.immutable.HashSet().seq())); - case TypeExp typeExp -> new ZeroedConstNode((Rql2Type) typeExp.t()); + new ZeroedConstNode(SnapiByteType.apply(new scala.collection.immutable.HashSet().seq())); + case TypeExp typeExp -> new ZeroedConstNode((SnapiType) typeExp.t()); case NullConst ignored -> new OptionNoneNode(); case BoolConst v -> new BoolNode(v.value()); case ByteConst v -> new ByteNode(v.value()); @@ -575,18 +575,18 @@ yield switch (entity) { } case LetBindEntity b -> { SlotLocation slotLocation = findSlot(b); - yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), (Rql2Type) tipe(b.b().e())) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) tipe(b.b().e())); + yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), (SnapiType) tipe(b.b().e())) : + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (SnapiType) tipe(b.b().e())); } case LetFunEntity f -> { SlotLocation slotLocation = findSlot(f); yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) analyzer.idnType(f.f().i())); + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (SnapiType) analyzer.idnType(f.f().i())); } case LetFunRecEntity f -> { SlotLocation slotLocation = findSlot(f); yield slotLocation.depth() == 0 ? ReadLocalVariableNodeGen.create(slotLocation.slot(), null) : - ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (Rql2Type) analyzer.idnType(f.f().i())); + ReadClosureVariableNodeGen.create(slotLocation.depth(), slotLocation.slot(), (SnapiType) analyzer.idnType(f.f().i())); } case FunParamEntity f -> { int depth = getCurrentDepth() - getEntityDepth(f); @@ -642,7 +642,7 @@ case FunApp fa when tipe(fa.f()) instanceof PackageEntryType -> { TruffleEntryExtension e = getEntry(pet.pkgName(), pet.entName()); yield e.toTruffle( t, - JavaConverters.asJavaCollection(fa.args()).stream().map(a -> new Rql2Arg(a.e(), tipe(a.e()), a.idn())).toList(), + JavaConverters.asJavaCollection(fa.args()).stream().map(a -> new SnapiArg(a.e(), tipe(a.e()), a.idn())).toList(), this ); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java index 35be50b82..5ace43f32 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmit.java @@ -15,12 +15,12 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.nodes.RootNode; import com.rawlabs.compiler.Entrypoint; -import com.rawlabs.snapi.frontend.rql2.ProgramContext; -import com.rawlabs.snapi.frontend.rql2.Tree; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.frontend.rql2.source.Exp; -import com.rawlabs.snapi.frontend.rql2.source.SourceProgram; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.ProgramContext; +import com.rawlabs.snapi.frontend.snapi.Tree; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.frontend.snapi.source.Exp; +import com.rawlabs.snapi.frontend.snapi.source.SourceProgram; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.StatementNode; @@ -30,12 +30,12 @@ public class TruffleEmit { public static Entrypoint doEmit( SourceProgram program, - Rql2Language language, + SnapiLanguage language, com.rawlabs.snapi.frontend.base.ProgramContext programContext) { - ProgramContext ctx = (com.rawlabs.snapi.frontend.rql2.ProgramContext) programContext; + ProgramContext ctx = (com.rawlabs.snapi.frontend.snapi.ProgramContext) programContext; Tree tree = new Tree(program, true, ctx); SnapiTruffleEmitter emitter = new SnapiTruffleEmitter(tree, language, ctx); - Rql2Program prog = (Rql2Program) tree.root(); + SnapiProgram prog = (SnapiProgram) tree.root(); Exp bodyExp = (prog.me().isDefined()) ? prog.me().get() : new IntConst("0"); emitter.addScope(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java index 8444ff83c..cdbbec010 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEmitter.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter; import com.oracle.truffle.api.frame.FrameDescriptor; -import com.rawlabs.snapi.frontend.rql2.source.Exp; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Method; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.Exp; +import com.rawlabs.snapi.frontend.snapi.source.SnapiMethod; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.StatementNode; import com.rawlabs.snapi.truffle.ast.expressions.function.ClosureNode; @@ -31,7 +31,7 @@ public abstract class TruffleEmitter { public abstract FrameDescriptor.Builder getFrameDescriptorBuilder(); - public abstract Rql2Language getLanguage(); + public abstract SnapiLanguage getLanguage(); - protected abstract StatementNode emitMethod(Rql2Method m); + protected abstract StatementNode emitMethod(SnapiMethod m); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java index 25c047ac7..4cf10b822 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleEntryExtension.java @@ -13,22 +13,22 @@ package com.rawlabs.snapi.truffle.emitter; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.List; import java.util.stream.Collectors; public interface TruffleEntryExtension { - default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { throw new UnsupportedOperationException("Not implemented"); } - default ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - return toTruffle(type, rql2argsToTruffleArgs(args, emitter), emitter.getLanguage()); + default ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + return toTruffle(type, snapiargsToTruffleArgs(args, emitter), emitter.getLanguage()); } - default List rql2argsToTruffleArgs(List args, TruffleEmitter emitter) { + default List snapiargsToTruffleArgs(List args, TruffleEmitter emitter) { return args.stream() .map( a -> diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java index 0b6ad1f1d..e9201df9a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/TruffleShortEntryExtension.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import java.util.List; import java.util.stream.Collectors; @@ -27,7 +27,7 @@ public interface TruffleShortEntryExtension extends TruffleEntryExtension { ExpressionNode toTruffle(List args); - default ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + default ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { List orderedArgs = args.stream() .filter(a -> a.idn().isEmpty()) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java index 262b497c9..35b0ac234 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/CompilerScalaConsts.java @@ -12,10 +12,10 @@ package com.rawlabs.snapi.truffle.emitter.builtin; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsNullableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsTryableTypeProperty; public class CompilerScalaConsts { - public static final Rql2IsTryableTypeProperty tryable = Rql2IsTryableTypeProperty.apply(); - public static final Rql2IsNullableTypeProperty nullable = Rql2IsNullableTypeProperty.apply(); + public static final SnapiIsTryableTypeProperty tryable = SnapiIsTryableTypeProperty.apply(); + public static final SnapiIsNullableTypeProperty nullable = SnapiIsNullableTypeProperty.apply(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java index 6afb9061e..116369544 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/WithArgs.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import java.util.List; @@ -40,10 +40,10 @@ default ExpressionNode[] optionalArgs(List args) { .toArray(ExpressionNode[]::new); } - default Rql2TypeWithProperties[] optionalArgsTypes(List args) { + default SnapiTypeWithProperties[] optionalArgsTypes(List args) { return args.stream() .filter(a -> a.identifier() != null) - .map(a -> (Rql2TypeWithProperties) a.type()) - .toArray(Rql2TypeWithProperties[]::new); + .map(a -> (SnapiTypeWithProperties) a.type()) + .toArray(SnapiTypeWithProperties[]::new); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java index ff20a77ce..1d1eeab69 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/aws_extension/TruffleAwsV4SignedRequestEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.aws_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.AwsV4SignedRequest; -import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.AwsV4SignedRequest; +import com.rawlabs.snapi.frontend.snapi.source.SnapiAttrType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiListType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiRecordType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.aws_package.AwsV4SignedRequestNodeGen; @@ -33,7 +33,7 @@ public class TruffleAwsV4SignedRequestEntry extends AwsV4SignedRequest implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode key = args.get(0).exprNode(); ExpressionNode secretKey = args.get(1).exprNode(); ExpressionNode service = args.get(2).exprNode(); @@ -97,8 +97,8 @@ public ExpressionNode toTruffle(Type type, List args, Rql2Language r .findFirst() .orElse( new ListBuildNode( - Rql2ListType.apply( - Rql2RecordType.apply(new Vector(0, 0, 0), new HashSet<>()), + SnapiListType.apply( + SnapiRecordType.apply(new Vector(0, 0, 0), new HashSet<>()), new HashSet<>()), new ExpressionNode[] {})); @@ -109,8 +109,8 @@ public ExpressionNode toTruffle(Type type, List args, Rql2Language r .findFirst() .orElse( new ListBuildNode( - Rql2ListType.apply( - Rql2RecordType.apply(new Vector(0, 0, 0), new HashSet<>()), + SnapiListType.apply( + SnapiRecordType.apply(new Vector(0, 0, 0), new HashSet<>()), new HashSet<>()), new ExpressionNode[] {})); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java index 9240d4fc5..5e8317d9b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryBase64Entry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BinaryBase64Entry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.BinaryBase64Entry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package.BinaryBase64NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java index dc85223af..940143bfd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleBinaryReadEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BinaryReadEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.BinaryReadEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package.BinaryReadNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java index 39d095073..131b95c89 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/binary_extension/TruffleFromStringBinaryEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.binary_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FromStringBinaryEntryExtension; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FromStringBinaryEntryExtension; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.binary_package.BinaryFromStringNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java index 1ed8feaba..314fc5d0f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/byte_extension/TruffleByteFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.byte_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ByteFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ByteFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.byte_package.ByteFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleByteFromEntry extends ByteFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ByteFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java index b07969aee..24951a120 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleBuildCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BuildCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.BuildCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleBuildCollectionEntry extends BuildCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new CollectionBuildNode( args.stream().map(TruffleArg::exprNode).toArray(ExpressionNode[]::new)); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java index 33946d4ff..bbba2b08f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleCountCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CountCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.CountCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -28,8 +28,8 @@ public class TruffleCountCollectionEntry extends CountCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java index 6a9ebb86b..bbcd55cdb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleDistinctCollectionEntry.java @@ -15,10 +15,10 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DistinctCollectionEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DistinctCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionDistinctNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -29,8 +29,8 @@ public class TruffleDistinctCollectionEntry extends DistinctCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = @@ -42,7 +42,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em return CollectionDistinctNodeGen.create( truffleArgs.get(0).exprNode(), - (Rql2TypeWithProperties) ((Rql2IterableType) type).innerType(), + (SnapiTypeWithProperties) ((SnapiIterableType) type).innerType(), generatorSlot, offHeapDistinctSlot); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java index 069ef77bd..ef2632f8c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleEmptyCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EmptyCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.EmptyCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleEmptyCollectionEntry extends EmptyCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new CollectionBuildNode(new ExpressionNode[0]); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java index c9be6ab07..4068d9aa6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleExistsCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ExistsCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ExistsCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionExistsNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -27,8 +27,8 @@ public class TruffleExistsCollectionEntry extends ExistsCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java index 4284ab729..9ad8e1cae 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFilterCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FilterCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FilterCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFilterNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -27,8 +27,8 @@ public class TruffleFilterCollectionEntry extends FilterCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int collectionSlot = builder.addSlot( diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java index fbafc1bda..b5f4eef1e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFirstCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FirstCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FirstCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFirstNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleFirstCollectionEntry extends FirstCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return CollectionFirstNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java index 9d79cad15..154402c60 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleFromCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FromCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FromCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleFromCollectionEntry extends FromCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return CollectionFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java index f3b036601..1b1b93121 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleGroupCollectionEntry.java @@ -15,9 +15,9 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.GroupCollectionEntry; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.GroupCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionGroupByNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -31,8 +31,8 @@ public class TruffleGroupCollectionEntry extends GroupCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = @@ -41,30 +41,30 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em builder.addSlot(FrameSlotKind.Object, "function", "a slot to store the function of osr"); int mapSlot = builder.addSlot(FrameSlotKind.Object, "map", "a slot to store the map of osr"); - Rql2IterableType iterable = (Rql2IterableType) type; - Rql2RecordType record = (Rql2RecordType) iterable.innerType(); - Rql2AttrType[] atts = + SnapiIterableType iterable = (SnapiIterableType) type; + SnapiRecordType record = (SnapiRecordType) iterable.innerType(); + SnapiAttrType[] atts = JavaConverters.asJavaCollection(record.atts()).stream() - .map(a -> (Rql2AttrType) a) - .toArray(Rql2AttrType[]::new); + .map(a -> (SnapiAttrType) a) + .toArray(SnapiAttrType[]::new); - Rql2TypeWithProperties keyType = - (Rql2TypeWithProperties) + SnapiTypeWithProperties keyType = + (SnapiTypeWithProperties) Arrays.stream(atts) .filter(a -> a.idn().equals("key")) .findFirst() - .orElse(Rql2AttrType.apply("key", new Rql2UndefinedType(new HashSet<>()))) + .orElse(SnapiAttrType.apply("key", new SnapiUndefinedType(new HashSet<>()))) .tipe(); - Rql2IterableType iterableValueType = - (Rql2IterableType) + SnapiIterableType iterableValueType = + (SnapiIterableType) Arrays.stream(atts) .filter(a -> a.idn().equals("group")) .findFirst() - .orElse(Rql2AttrType.apply("key", new Rql2UndefinedType(new HashSet<>()))) + .orElse(SnapiAttrType.apply("key", new SnapiUndefinedType(new HashSet<>()))) .tipe(); - Rql2TypeWithProperties valueType = (Rql2TypeWithProperties) iterableValueType.innerType(); + SnapiTypeWithProperties valueType = (SnapiTypeWithProperties) iterableValueType.innerType(); return CollectionGroupByNodeGen.create( truffleArgs.get(0).exprNode(), diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java index a59753646..374be9e1b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalEquiJoinCollectionEntry.java @@ -15,11 +15,11 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.InternalEquiJoinCollectionEntry; -import com.rawlabs.snapi.frontend.rql2.source.FunType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.InternalEquiJoinCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.source.FunType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionEquiJoinNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -30,8 +30,8 @@ public class TruffleInternalEquiJoinCollectionEntry extends InternalEquiJoinCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int computeNextSlot = builder.addSlot( @@ -53,17 +53,17 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em TruffleArg remap = truffleArgs.get(4); FunType funType = (FunType) leftK.type(); - Rql2IterableType leftValue = (Rql2IterableType) left.type(); - Rql2IterableType rightValue = (Rql2IterableType) right.type(); + SnapiIterableType leftValue = (SnapiIterableType) left.type(); + SnapiIterableType rightValue = (SnapiIterableType) right.type(); return new CollectionEquiJoinNode( left.exprNode(), right.exprNode(), leftK.exprNode(), rightK.exprNode(), - (Rql2TypeWithProperties) funType.r(), - (Rql2TypeWithProperties) leftValue.innerType(), - (Rql2TypeWithProperties) rightValue.innerType(), + (SnapiTypeWithProperties) funType.r(), + (SnapiTypeWithProperties) leftValue.innerType(), + (SnapiTypeWithProperties) rightValue.innerType(), remap.exprNode(), computeNextSlot, shouldContinueSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java index abf58baa8..72e15908b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleInternalJoinCollectionEntry.java @@ -15,11 +15,11 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.InternalJoinCollectionEntry; -import com.rawlabs.snapi.frontend.rql2.source.FunType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.InternalJoinCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.source.FunType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionJoinNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -30,8 +30,8 @@ public class TruffleInternalJoinCollectionEntry extends InternalJoinCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int computeNextSlot = @@ -52,8 +52,8 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em TruffleArg right = truffleArgs.get(1); TruffleArg reshape = truffleArgs.get(2); TruffleArg predicate = truffleArgs.get(3); - Rql2IterableType rql2IterableType = (Rql2IterableType) right.type(); - Rql2TypeWithProperties rightType = (Rql2TypeWithProperties) rql2IterableType.innerType(); + SnapiIterableType snapiIterableType = (SnapiIterableType) right.type(); + SnapiTypeWithProperties rightType = (SnapiTypeWithProperties) snapiIterableType.innerType(); boolean reshapeBeforePredicate = ((FunType) predicate.type()).ms().size() == 1; return CollectionJoinNodeGen.create( left.exprNode(), diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java index 005050023..fad87fd29 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleLastCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LastCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LastCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -28,8 +28,8 @@ public class TruffleLastCollectionEntry extends LastCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java index e0892b7aa..51cef79be 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMaxCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MaxCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MaxCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -27,8 +27,8 @@ public class TruffleMaxCollectionEntry extends MaxCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java index 267d5c214..8ba419615 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMinCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MinCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MinCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -27,8 +27,8 @@ public class TruffleMinCollectionEntry extends MinCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java index bc0ff4f36..4feccd9fd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleMkStringCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MkStringCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MkStringCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionMkStringNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; @@ -28,8 +28,8 @@ public class TruffleMkStringCollectionEntry extends MkStringCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java index 9f60ddce5..29c412148 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleOrderByCollectionEntry.java @@ -15,11 +15,11 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OrderByCollectionEntry; -import com.rawlabs.snapi.frontend.rql2.source.FunType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.OrderByCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.source.FunType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionOrderByNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -31,8 +31,8 @@ public class TruffleOrderByCollectionEntry extends OrderByCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = @@ -58,13 +58,13 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em .toArray(ExpressionNode[]::new); index.set(0); - Rql2TypeWithProperties[] keyTypes = + SnapiTypeWithProperties[] keyTypes = truffleArgs.stream() .skip(1) .map(a -> index.getAndIncrement()) .filter(a -> a % 2 == 0) - .map(a -> (Rql2TypeWithProperties) ((FunType) truffleArgs.get(a + 1).type()).r()) - .toArray(Rql2TypeWithProperties[]::new); + .map(a -> (SnapiTypeWithProperties) ((FunType) truffleArgs.get(a + 1).type()).r()) + .toArray(SnapiTypeWithProperties[]::new); index.set(0); ExpressionNode[] orderings = @@ -74,8 +74,8 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em .filter(a -> a % 2 == 1) .map(a -> truffleArgs.get(a + 1).exprNode()) .toArray(ExpressionNode[]::new); - Rql2TypeWithProperties valueType = - (Rql2TypeWithProperties) ((Rql2IterableType) truffleArgs.get(0).type()).innerType(); + SnapiTypeWithProperties valueType = + (SnapiTypeWithProperties) ((SnapiIterableType) truffleArgs.get(0).type()).innerType(); return new CollectionOrderByNode( truffleArgs.get(0).exprNode(), diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java index 34986ec60..c3904975f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleSumCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SumCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.SumCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -27,8 +27,8 @@ public class TruffleSumCollectionEntry extends SumCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java index 77874e87a..55e8918ad 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTakeCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TakeCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TakeCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTakeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleTakeCollectionEntry extends TakeCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return CollectionTakeNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java index 3c6749b5c..6a960b58c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTransformCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TransformCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TransformCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTransformNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -25,7 +25,7 @@ public class TruffleTransformCollectionEntry extends TransformCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return CollectionTransformNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java index 4d60f7d33..5d22b7296 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleTupleAvgCollectionEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TupleAvgCollectionEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TupleAvgCollectionEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTupleAvgNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -27,8 +27,8 @@ public class TruffleTupleAvgCollectionEntry extends TupleAvgCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java index 4d65e415b..ce83261ec 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnionCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.UnionCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.UnionCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionUnionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleUnionCollectionEntry extends UnionCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new CollectionUnionNode( args.stream().map(TruffleArg::exprNode).toArray(ExpressionNode[]::new)); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java index 4c91a89b6..382b9329a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleUnnestCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.UnnestCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.UnnestCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionUnnestNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleUnnestCollectionEntry extends UnnestCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return CollectionUnnestNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java index d2e0518e1..c9fa2b896 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/collection_extension/TruffleZipCollectionEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.collection_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ZipCollectionEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ZipCollectionEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionZipNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleZipCollectionEntry extends ZipCollectionEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return CollectionZipNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java index 4d9ba62bc..b265d4c46 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/CsvParser.java @@ -14,10 +14,10 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; @@ -66,8 +66,8 @@ public CsvParser(List args) { arg("nulls") .orElse( new ListBuildNode( - Rql2ListType.apply( - Rql2StringType.apply(new HashSet<>()), + SnapiListType.apply( + SnapiStringType.apply(new HashSet<>()), new HashSet<>()), new ExpressionNode[] {new StringNode("")})); @@ -75,7 +75,7 @@ public CsvParser(List args) { arg("nans") .orElse( new ListBuildNode( - Rql2ListType.apply(Rql2StringType.apply( + SnapiListType.apply(SnapiStringType.apply( new HashSet<>()), new HashSet<>()), new ExpressionNode[] {})); @@ -87,25 +87,25 @@ public CsvParser(List args) { } private RecordParseCsvNode getRecordParser( - Rql2TypeWithProperties t, Rql2Language lang) { - Rql2IterableType rql2IterableType = (Rql2IterableType) t; - Rql2RecordType rql2RecordType = (Rql2RecordType) rql2IterableType.innerType(); - assert rql2RecordType.props().isEmpty(); - assert rql2IterableType.props().isEmpty(); + SnapiTypeWithProperties t, SnapiLanguage lang) { + SnapiIterableType snapiIterableType = (SnapiIterableType) t; + SnapiRecordType snapiRecordType = (SnapiRecordType) snapiIterableType.innerType(); + assert snapiRecordType.props().isEmpty(); + assert snapiIterableType.props().isEmpty(); ProgramExpressionNode[] columnParsers = - JavaConverters.seqAsJavaList(rql2RecordType.atts()).stream().map(a -> (Rql2AttrType) a) + JavaConverters.seqAsJavaList(snapiRecordType.atts()).stream().map(a -> (SnapiAttrType) a) .map(col -> columnParser(col.tipe(), lang)) .map(parser -> new ProgramExpressionNode(lang, new FrameDescriptor(), parser)) .toArray(ProgramExpressionNode[]::new); return new RecordParseCsvNode( columnParsers, - JavaConverters.seqAsJavaList(rql2RecordType.atts()).stream().map(a -> (Rql2AttrType) a).toArray(Rql2AttrType[]::new)); + JavaConverters.seqAsJavaList(snapiRecordType.atts()).stream().map(a -> (SnapiAttrType) a).toArray(SnapiAttrType[]::new)); } public ExpressionNode stringParser( - ExpressionNode str, Rql2TypeWithProperties t, Rql2Language lang) { + ExpressionNode str, SnapiTypeWithProperties t, SnapiLanguage lang) { return new IterableParseCsvString( str, skip, @@ -120,7 +120,7 @@ public ExpressionNode stringParser( timestampFormat); } - public ExpressionNode fileParser(ExpressionNode url, Rql2TypeWithProperties t, Rql2Language lang) { + public ExpressionNode fileParser(ExpressionNode url, SnapiTypeWithProperties t, SnapiLanguage lang) { return new IterableParseCsvFile( url, encoding, @@ -136,43 +136,43 @@ public ExpressionNode fileParser(ExpressionNode url, Rql2TypeWithProperties t, R timestampFormat); } - private ExpressionNode columnParser(Type t, Rql2Language lang) { + private ExpressionNode columnParser(Type t, SnapiLanguage lang) { return switch (t) { - case Rql2TypeWithProperties r when r.props().contains(tryable) -> { + case SnapiTypeWithProperties r when r.props().contains(tryable) -> { ExpressionNode inner = columnParser(r.cloneAndRemoveProp(tryable), lang); yield new TryableParseCsvNode(program(inner, lang)); } - case Rql2TypeWithProperties r when r.props().contains(nullable) -> switch (r) { - case Rql2ByteType ignored -> new OptionByteParseCsvNode(); - case Rql2ShortType ignored -> new OptionShortParseCsvNode(); - case Rql2IntType ignored -> new OptionIntParseCsvNode(); - case Rql2LongType ignored -> new OptionLongParseCsvNode(); - case Rql2FloatType ignored -> new OptionFloatParseCsvNode(); - case Rql2DoubleType ignored -> new OptionDoubleParseCsvNode(); - case Rql2DecimalType ignored -> new OptionDecimalParseCsvNode(); - case Rql2StringType ignored -> new OptionStringParseCsvNode(); - case Rql2BoolType ignored -> new OptionBoolParseCsvNode(); - case Rql2DateType ignored -> new OptionDateParseCsvNode(); - case Rql2TimeType ignored -> new OptionTimeParseCsvNode(); - case Rql2TimestampType ignored -> new OptionTimestampParseCsvNode(); - case Rql2UndefinedType ignored -> new OptionUndefinedParseCsvNode(); + case SnapiTypeWithProperties r when r.props().contains(nullable) -> switch (r) { + case SnapiByteType ignored -> new OptionByteParseCsvNode(); + case SnapiShortType ignored -> new OptionShortParseCsvNode(); + case SnapiIntType ignored -> new OptionIntParseCsvNode(); + case SnapiLongType ignored -> new OptionLongParseCsvNode(); + case SnapiFloatType ignored -> new OptionFloatParseCsvNode(); + case SnapiDoubleType ignored -> new OptionDoubleParseCsvNode(); + case SnapiDecimalType ignored -> new OptionDecimalParseCsvNode(); + case SnapiStringType ignored -> new OptionStringParseCsvNode(); + case SnapiBoolType ignored -> new OptionBoolParseCsvNode(); + case SnapiDateType ignored -> new OptionDateParseCsvNode(); + case SnapiTimeType ignored -> new OptionTimeParseCsvNode(); + case SnapiTimestampType ignored -> new OptionTimestampParseCsvNode(); + case SnapiUndefinedType ignored -> new OptionUndefinedParseCsvNode(); default -> throw new TruffleInternalErrorException(); }; - case Rql2TypeWithProperties r -> { + case SnapiTypeWithProperties r -> { assert r.props().isEmpty(); // These would be types returned by the inferrer. Not all types are expected // from the inferrer. yield switch (r){ - case Rql2IntType ignored -> new IntParseCsvNode(); - case Rql2LongType ignored -> new LongParseCsvNode(); - case Rql2DoubleType ignored -> new DoubleParseCsvNode(); - case Rql2DecimalType ignored -> new DecimalParseCsvNode(); - case Rql2BoolType ignored -> new BoolParseCsvNode(); - case Rql2StringType ignored -> new StringParseCsvNode(); - case Rql2DateType ignored -> new DateParseCsvNode(); - case Rql2TimeType ignored -> new TimeParseCsvNode(); - case Rql2TimestampType ignored -> new TimestampParseCsvNode(); - case Rql2UndefinedType ignored -> new UndefinedParseCsvNode(); + case SnapiIntType ignored -> new IntParseCsvNode(); + case SnapiLongType ignored -> new LongParseCsvNode(); + case SnapiDoubleType ignored -> new DoubleParseCsvNode(); + case SnapiDecimalType ignored -> new DecimalParseCsvNode(); + case SnapiBoolType ignored -> new BoolParseCsvNode(); + case SnapiStringType ignored -> new StringParseCsvNode(); + case SnapiDateType ignored -> new DateParseCsvNode(); + case SnapiTimeType ignored -> new TimeParseCsvNode(); + case SnapiTimestampType ignored -> new TimestampParseCsvNode(); + case SnapiUndefinedType ignored -> new UndefinedParseCsvNode(); default -> throw new TruffleInternalErrorException(); }; } @@ -180,7 +180,7 @@ yield switch (r){ }; } - private ProgramExpressionNode program(ExpressionNode e, Rql2Language lang){ + private ProgramExpressionNode program(ExpressionNode e, SnapiLanguage lang){ FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramExpressionNode(lang, frameDescriptor, e); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java index 67f718477..3e4ab400d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvParseEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CsvParseEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.CsvParseEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; @@ -23,10 +23,10 @@ public class TruffleCsvParseEntry extends CsvParseEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { CsvParser makeParser = new CsvParser(args); ExpressionNode url = args.stream().filter(a -> a.identifier() == null).findFirst().orElseThrow().exprNode(); - return makeParser.stringParser(url, (Rql2TypeWithProperties) type, rawLanguage); + return makeParser.stringParser(url, (SnapiTypeWithProperties) type, rawLanguage); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java index 6ba2d2a9f..f37f24143 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/csv_extension/TruffleCsvReadEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.csv_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CsvReadEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.CsvReadEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; @@ -23,10 +23,10 @@ public class TruffleCsvReadEntry extends CsvReadEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { CsvParser makeParser = new CsvParser(args); ExpressionNode url = args.stream().filter(a -> a.identifier() == null).findFirst().orElseThrow().exprNode(); - return makeParser.fileParser(url, (Rql2TypeWithProperties) type, rawLanguage); + return makeParser.fileParser(url, (SnapiTypeWithProperties) type, rawLanguage); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java index 5534a36e6..9d848ae46 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateAddIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateAddIntervalEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateAddIntervalEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateAddIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java index 1b6677e27..2aea0c0cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateBuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateBuildEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateBuildEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateBuildNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java index 5a13c532a..5264fc172 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateDayEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateDayEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateDayEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateDayNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java index 0b5031d44..418f52ad3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromEpochDayEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateFromEpochDayEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateFromEpochDayEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateFromEpochDayNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java index fc8db21bd..85b3b68a2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateFromTimestampEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateFromTimestampEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateFromTimestampEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateFromTimestampNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java index ec545edcd..05f49190e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateMonthEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateMonthEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateMonthEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateMonthNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java index 723eb53c8..ba297e75b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateNowEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateNowEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateNowEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateNowNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java index f07e67a66..9edd2fca0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateParseEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateParseEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateParseEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java index ba6512c4a..d08886eee 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateSubtractEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateSubtractEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateSubtractNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java index 611c7e0ae..597b75ea6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateSubtractIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateSubtractIntervalEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateSubtractIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java index c46f90766..d12a1dc3d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/date_extension/TruffleDateYearEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.date_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateYearEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateYearEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.date_package.DateYearNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java index bee6b7911..81cf67a66 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DecimalFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DecimalFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.decimal_package.DecimalFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleDecimalFromEntry extends DecimalFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return DecimalFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java index 605aa9113..84b56914f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/decimal_extension/TruffleDecimalRoundEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.decimal_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DecimalRoundEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DecimalRoundEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.decimal_package.DecimalRoundNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java index 28deabb9a..11fec4184 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/double_extension/TruffleDoubleFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.double_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DoubleFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DoubleFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.double_package.DoubleFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleDoubleFromEntry extends DoubleFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return DoubleFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java index f39f4069e..e62d66e66 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentParameterEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EnvironmentParameterEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.EnvironmentParameterEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package.EnvironmentParameterNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -26,9 +26,9 @@ public class TruffleEnvironmentParameterEntry extends EnvironmentParameterEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode paramIndex = args.get(1).exprNode(); return EnvironmentParameterNodeGen.create( - paramIndex, (Rql2Type) resetProps(type, new HashSet<>())); + paramIndex, (SnapiType) resetProps(type, new HashSet<>())); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java index 7883e2389..a58fa1931 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentScopesEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EnvironmentScopesEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.EnvironmentScopesEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package.EnvironmentScopesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java index 9fc238705..e364912c8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/environment_extension/TruffleEnvironmentSecretEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.environment_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EnvironmentSecretEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.EnvironmentSecretEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.environment_package.EnvironmentSecretNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java index c5530b6be..7b594ceb8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ErrorBuildEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ErrorBuildEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableFailureNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleErrorBuildEntry extends ErrorBuildEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableFailureNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java index 62e51f665..1f6d53969 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorBuildWithTypeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ErrorBuildWithTypeEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ErrorBuildWithTypeEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableFailureWithTypeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleErrorBuildWithTypeEntry extends ErrorBuildWithTypeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableFailureWithTypeNodeGen.create(args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java index 6328d085c..4dcc38e16 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/error_extension/TruffleErrorGetEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.error_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ErrorGetEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ErrorGetEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableGetFailureNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleErrorGetEntry extends ErrorGetEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableGetFailureNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java index 13169c980..bd6edd79a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/float_extension/TruffleFloatFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.float_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FloatFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FloatFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleFloatFromEntry extends FloatFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return FloatFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java index 24f64d555..4822ddb91 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/function_extension/TruffleFunctionInvokeAfterEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.function_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FunctionInvokeAfterEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FunctionInvokeAfterEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.function_package.FunctionInvokeAfterNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleFunctionInvokeAfterEntry extends FunctionInvokeAfterEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return FunctionInvokeAfterNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java index f17c1a218..bde809110 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpCallEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpCallEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.HttpCallEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromHttpNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -33,7 +33,7 @@ public TruffleHttpCallEntry(String method) { } @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode url = args.get(0).exprNode(); ExpressionNode bodyString = arg(args, "bodyString").orElse(null); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java index 46bfd4ce2..ee4163d0c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpReadEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpReadEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.HttpReadEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package.HttpReadNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java index 177b4eb9d..774df79ca 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlDecode.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpUrlDecodeEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.HttpUrlDecodeEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package.HttpUrlDecodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java index 438dd661e..b0d157b22 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/http_extension/TruffleHttpUrlEncode.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.http_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.HttpUrlEncodeEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.HttpUrlEncodeEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.http_package.HttpUrlEncodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java index 9ee9c2dd2..29fb0c7b6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.int_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.int_package.IntFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleIntFromEntry extends IntFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return IntFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java index e75cc7ec1..f209a7e98 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/int_extension/TruffleIntRangeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.int_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntRangeEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntRangeEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.int_package.IntRangeNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; @@ -24,7 +24,7 @@ public class TruffleIntRangeEntry extends IntRangeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode start = args.get(0).exprNode(); ExpressionNode end = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java index 9f353ef4d..b2eafa756 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleBuildIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BuildIntervalEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.BuildIntervalEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; @@ -24,7 +24,7 @@ public class TruffleBuildIntervalEntry extends BuildIntervalEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode y = args.stream() .filter(a -> a.identifier() != null && a.identifier().equals("years")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java index ec55e7260..c41f7a8b6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalDaysEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalDaysEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalDaysEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalDaysNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java index 373464004..adfb96adc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalFromMillisEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalFromMillisEntryExtension; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalFromMillisEntryExtension; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalFromMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java index 9091f18f3..02eac5bd0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalHoursEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalHoursEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalHoursEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalHoursNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java index 0873a057d..ef8f8c427 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMillisEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalMillisEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalMillisEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java index 5656973a2..e1efe3feb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMinutesEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalMinutesEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalMinutesEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMinutesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java index a4130419d..3d9e3b299 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalMonthsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalMonthsEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalMonthsEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalMonthsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java index c0bcda9af..a0b95bebd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalParseEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalParseEntryExtension; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalParseEntryExtension; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java index d28cb05c2..56662f80f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalSecondsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalSecondsEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalSecondsEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalSecondsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java index 4a96b1bbf..52b492372 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalToMillisEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalToMillisEntryExtension; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalToMillisEntryExtension; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalToMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java index 8b5e9da37..693052641 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalWeeksEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalWeeksEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalWeeksEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalWeeksNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java index 926bcae5a..cc4bac4b8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/interval_extension/TruffleIntervalYearsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.interval_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalYearsEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalYearsEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalYearsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java index 62da8a516..14213c306 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/jdbc/Jdbc.java @@ -16,9 +16,9 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.jdbc.JdbcQueryNode; import com.rawlabs.snapi.truffle.ast.io.jdbc.*; @@ -32,22 +32,22 @@ static public JdbcQueryNode query( ExpressionNode query, Type t, JdbcExceptionHandler exceptionHandler, - Rql2Language lang) { - Rql2IterableType iterableType = (Rql2IterableType) t; - Rql2RecordType recordType = (Rql2RecordType) iterableType.innerType(); + SnapiLanguage lang) { + SnapiIterableType iterableType = (SnapiIterableType) t; + SnapiRecordType recordType = (SnapiRecordType) iterableType.innerType(); assert iterableType.props().isEmpty(); assert recordType.props().isEmpty(); FrameDescriptor frameDescriptor = new FrameDescriptor(); ProgramExpressionNode[] columnParsers = - JavaConverters.asJavaCollection(recordType.atts()).stream().map(a -> (Rql2AttrType) a) + JavaConverters.asJavaCollection(recordType.atts()).stream().map(a -> (SnapiAttrType) a) .map(att -> columnReader(att.idn(), att.tipe(), lang)) .toArray(ProgramExpressionNode[]::new); RecordReadJdbcQuery recordParser = new RecordReadJdbcQuery( columnParsers, - JavaConverters.asJavaCollection(recordType.atts()).stream().map(a -> (Rql2AttrType) a).toArray(Rql2AttrType[]::new)); + JavaConverters.asJavaCollection(recordType.atts()).stream().map(a -> (SnapiAttrType) a).toArray(SnapiAttrType[]::new)); return new JdbcQueryNode( location, query, @@ -55,30 +55,30 @@ static public JdbcQueryNode query( exceptionHandler); } - static private ProgramExpressionNode columnReader(String colName, Type t, Rql2Language lang) { + static private ProgramExpressionNode columnReader(String colName, Type t, SnapiLanguage lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); ExpressionNode node = switch (t){ - case Rql2TypeWithProperties r when r.props().contains(tryable) -> { + case SnapiTypeWithProperties r when r.props().contains(tryable) -> { ProgramExpressionNode inner = columnReader(colName,r.cloneAndRemoveProp(tryable),lang); yield new TryableReadJdbcQuery(inner, colName); } - case Rql2TypeWithProperties r when r.props().contains(nullable) -> { + case SnapiTypeWithProperties r when r.props().contains(nullable) -> { ProgramExpressionNode inner = columnReader(colName,r.cloneAndRemoveProp(nullable),lang); yield new NullableReadJdbcQuery(inner, colName); } - case Rql2ByteType ignored -> new ByteReadJdbcQuery(colName); - case Rql2ShortType ignored -> new ShortReadJdbcQuery(colName); - case Rql2IntType ignored -> new IntReadJdbcQuery(colName); - case Rql2LongType ignored -> new LongReadJdbcQuery(colName); - case Rql2FloatType ignored -> new FloatReadJdbcQuery(colName); - case Rql2DoubleType ignored -> new DoubleReadJdbcQuery(colName); - case Rql2DecimalType ignored -> new DecimalReadJdbcQuery(colName); - case Rql2StringType ignored -> new StringReadJdbcQuery(colName); - case Rql2DateType ignored -> new DateReadJdbcQuery(colName); - case Rql2TimeType ignored -> new TimeReadJdbcQuery(colName); - case Rql2TimestampType ignored -> new TimestampReadJdbcQuery(colName); - case Rql2BoolType ignored -> new BoolReadJdbcQuery(colName); - case Rql2BinaryType ignored -> new BinaryReadJdbcQuery(colName); + case SnapiByteType ignored -> new ByteReadJdbcQuery(colName); + case SnapiShortType ignored -> new ShortReadJdbcQuery(colName); + case SnapiIntType ignored -> new IntReadJdbcQuery(colName); + case SnapiLongType ignored -> new LongReadJdbcQuery(colName); + case SnapiFloatType ignored -> new FloatReadJdbcQuery(colName); + case SnapiDoubleType ignored -> new DoubleReadJdbcQuery(colName); + case SnapiDecimalType ignored -> new DecimalReadJdbcQuery(colName); + case SnapiStringType ignored -> new StringReadJdbcQuery(colName); + case SnapiDateType ignored -> new DateReadJdbcQuery(colName); + case SnapiTimeType ignored -> new TimeReadJdbcQuery(colName); + case SnapiTimestampType ignored -> new TimestampReadJdbcQuery(colName); + case SnapiBoolType ignored -> new BoolReadJdbcQuery(colName); + case SnapiBinaryType ignored -> new BinaryReadJdbcQuery(colName); default -> throw new TruffleInternalErrorException(); }; return new ProgramExpressionNode(lang, frameDescriptor, node); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java index 9761563af..e8aa939d6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/JsonParser.java @@ -14,9 +14,9 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.*; import com.rawlabs.snapi.truffle.ast.io.json.reader.parser.BinaryParseJsonNodeGen; @@ -53,11 +53,11 @@ public JsonParser(ExpressionNode dateFormat, ExpressionNode timeFormat, Expressi this.timestampFormat = timestampFormat; } - public ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, Rql2Language lang) { + public ProgramExpressionNode recurse(SnapiTypeWithProperties tipe, SnapiLanguage lang) { return recurse(tipe, true, lang); } - private ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, boolean appendNullCheck, Rql2Language lang) { + private ProgramExpressionNode recurse(SnapiTypeWithProperties tipe, boolean appendNullCheck, SnapiLanguage lang) { FrameDescriptor.Builder builder = FrameDescriptor.newBuilder(); int parserSlot = builder.addSlot( @@ -73,22 +73,22 @@ private ProgramExpressionNode recurse(Rql2TypeWithProperties tipe, boolean appen int resultSlot = builder.addSlot(FrameSlotKind.Object, "list", "a slot to store the result internal array for osr"); ExpressionNode e = switch (tipe){ - case Rql2TypeWithProperties nt when nt.props().contains(tryable) -> { - Rql2TypeWithProperties nextType = (Rql2TypeWithProperties) nt.cloneAndRemoveProp(tryable); - ProgramExpressionNode child = recurse(nextType, !(nt instanceof Rql2UndefinedType), lang); + case SnapiTypeWithProperties nt when nt.props().contains(tryable) -> { + SnapiTypeWithProperties nextType = (SnapiTypeWithProperties) nt.cloneAndRemoveProp(tryable); + ProgramExpressionNode child = recurse(nextType, !(nt instanceof SnapiUndefinedType), lang); yield new TryableParseJsonNode(child); } - case Rql2TypeWithProperties nt when nt.props().contains(nullable) -> { - Rql2TypeWithProperties nextType = (Rql2TypeWithProperties) nt.cloneAndRemoveProp(nullable); - ProgramExpressionNode child = recurse(nextType, !(nt instanceof Rql2UndefinedType), lang); + case SnapiTypeWithProperties nt when nt.props().contains(nullable) -> { + SnapiTypeWithProperties nextType = (SnapiTypeWithProperties) nt.cloneAndRemoveProp(nullable); + ProgramExpressionNode child = recurse(nextType, !(nt instanceof SnapiUndefinedType), lang); yield new NullableParseJsonNode(child); } - case Rql2TypeWithProperties v when v.props().isEmpty() -> { + case SnapiTypeWithProperties v when v.props().isEmpty() -> { ExpressionNode result = switch (v){ - case Rql2ListType r -> { - ProgramExpressionNode child = recurse((Rql2TypeWithProperties)r.innerType(), lang); + case SnapiListType r -> { + ProgramExpressionNode child = recurse((SnapiTypeWithProperties)r.innerType(), lang); yield new ListParseJsonNode( - (Rql2TypeWithProperties)r.innerType(), + (SnapiTypeWithProperties)r.innerType(), child.getCallTarget(), parserSlot, llistSlot, @@ -96,54 +96,54 @@ yield new ListParseJsonNode( listSizeSlot, resultSlot); } - case Rql2IterableType r ->{ - ProgramExpressionNode child = recurse((Rql2TypeWithProperties)r.innerType(), lang); + case SnapiIterableType r ->{ + ProgramExpressionNode child = recurse((SnapiTypeWithProperties)r.innerType(), lang); yield new IterableParseJsonNode( program(new ListParseJsonNode( - (Rql2TypeWithProperties)r.innerType(), + (SnapiTypeWithProperties)r.innerType(), child.getCallTarget(), parserSlot, llistSlot, currentIdxSlot, listSizeSlot, resultSlot), builder.build(), lang)); } - case Rql2RecordType r ->{ + case SnapiRecordType r ->{ LinkedHashMap hashMap = new LinkedHashMap<>(); ProgramExpressionNode[] children = JavaConverters.asJavaCollection(r.atts()) .stream() - .map(a -> (Rql2AttrType) a) - .map(att -> recurse((Rql2TypeWithProperties) att.tipe(),lang)) + .map(a -> (SnapiAttrType) a) + .map(att -> recurse((SnapiTypeWithProperties) att.tipe(),lang)) .toArray(ProgramExpressionNode[]::new); - JavaConverters.asJavaCollection(r.atts()).stream().map(a -> (Rql2AttrType) a).forEach(a -> hashMap.put(a.idn(),hashMap.size())); - List keys = JavaConverters.asJavaCollection(r.atts()).stream().map(a -> (Rql2AttrType) a).map(Rql2AttrType::idn).toList(); + JavaConverters.asJavaCollection(r.atts()).stream().map(a -> (SnapiAttrType) a).forEach(a -> hashMap.put(a.idn(),hashMap.size())); + List keys = JavaConverters.asJavaCollection(r.atts()).stream().map(a -> (SnapiAttrType) a).map(SnapiAttrType::idn).toList(); boolean hasDuplicateKeys = keys.size() != keys.stream().distinct().count(); yield new RecordParseJsonNode( children, hashMap, - JavaConverters.asJavaCollection(r.atts()).stream().map(a -> (Rql2AttrType) a).map(a -> (Rql2TypeWithProperties) a.tipe()).toArray(Rql2TypeWithProperties[]::new), + JavaConverters.asJavaCollection(r.atts()).stream().map(a -> (SnapiAttrType) a).map(a -> (SnapiTypeWithProperties) a.tipe()).toArray(SnapiTypeWithProperties[]::new), hasDuplicateKeys ); } - case Rql2ByteType ignored -> ByteParseJsonNodeGen.create(); - case Rql2ShortType ignored -> ShortParseJsonNodeGen.create(); - case Rql2IntType ignored -> IntParseJsonNodeGen.create(); - case Rql2LongType ignored -> LongParseJsonNodeGen.create(); - case Rql2FloatType ignored -> FloatParseJsonNodeGen.create(); - case Rql2DoubleType ignored -> DoubleParseJsonNodeGen.create(); - case Rql2DecimalType ignored -> DecimalParseJsonNodeGen.create(); - case Rql2BoolType ignored -> BooleanParseJsonNodeGen.create(); - case Rql2StringType ignored -> StringParseJsonNodeGen.create(); - case Rql2DateType ignored -> DateParseJsonNodeGen.create(dateFormat); - case Rql2TimeType ignored -> TimeParseJsonNodeGen.create(timeFormat); - case Rql2TimestampType ignored -> TimestampParseJsonNodeGen.create(timestampFormat); - case Rql2IntervalType ignored -> IntervalParseJsonNodeGen.create(); - case Rql2BinaryType ignored -> BinaryParseJsonNodeGen.create(); - case Rql2OrType or -> { + case SnapiByteType ignored -> ByteParseJsonNodeGen.create(); + case SnapiShortType ignored -> ShortParseJsonNodeGen.create(); + case SnapiIntType ignored -> IntParseJsonNodeGen.create(); + case SnapiLongType ignored -> LongParseJsonNodeGen.create(); + case SnapiFloatType ignored -> FloatParseJsonNodeGen.create(); + case SnapiDoubleType ignored -> DoubleParseJsonNodeGen.create(); + case SnapiDecimalType ignored -> DecimalParseJsonNodeGen.create(); + case SnapiBoolType ignored -> BooleanParseJsonNodeGen.create(); + case SnapiStringType ignored -> StringParseJsonNodeGen.create(); + case SnapiDateType ignored -> DateParseJsonNodeGen.create(dateFormat); + case SnapiTimeType ignored -> TimeParseJsonNodeGen.create(timeFormat); + case SnapiTimestampType ignored -> TimestampParseJsonNodeGen.create(timestampFormat); + case SnapiIntervalType ignored -> IntervalParseJsonNodeGen.create(); + case SnapiBinaryType ignored -> BinaryParseJsonNodeGen.create(); + case SnapiOrType or -> { ProgramExpressionNode[] children = JavaConverters.asJavaCollection(or.tipes()) .stream() - .map(t -> recurse((Rql2TypeWithProperties) t,lang)) + .map(t -> recurse((SnapiTypeWithProperties) t,lang)) .toArray(ProgramExpressionNode[]::new); yield new OrParseJsonNode(children); } - case Rql2UndefinedType ignored -> new UndefinedParseJsonNode(); + case SnapiUndefinedType ignored -> new UndefinedParseJsonNode(); default -> throw new TruffleInternalErrorException(); }; if (appendNullCheck) { @@ -156,7 +156,7 @@ yield new RecordParseJsonNode( return program(e, builder.build(), lang); } - private ProgramExpressionNode program(ExpressionNode e, FrameDescriptor frameDescriptor, Rql2Language lang){ + private ProgramExpressionNode program(ExpressionNode e, FrameDescriptor frameDescriptor, SnapiLanguage lang){ return new ProgramExpressionNode(lang, frameDescriptor, e); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java index ec172fa14..9daf7c677 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleParseJsonEntry.java @@ -15,9 +15,9 @@ import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.tryable; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ParseJsonEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ParseJsonEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParseNode; import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParseNodeGen; @@ -29,7 +29,7 @@ public class TruffleParseJsonEntry extends ParseJsonEntry implements TruffleEntryExtension, WithJsonArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode timeFormat = timeFormat(args); ExpressionNode dateFormat = dateFormat(args); ExpressionNode timestampFormat = timestampFormat(args); @@ -40,8 +40,8 @@ public ExpressionNode toTruffle(Type type, List args, Rql2Language r JsonParseNode parseNode = JsonParseNodeGen.create( unnamedArgs[0], - parser.recurse((Rql2TypeWithProperties) type, rawLanguage).getCallTarget()); - if (((Rql2TypeWithProperties) type).props().contains(tryable)) + parser.recurse((SnapiTypeWithProperties) type, rawLanguage).getCallTarget()); + if (((SnapiTypeWithProperties) type).props().contains(tryable)) return new TryableTopLevelWrapper(parseNode); else return parseNode; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java index 57c7440a3..28b105ae1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TrufflePrintJsonEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.json_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.PrintJsonEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.PrintJsonEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonPrintNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -25,10 +25,10 @@ public class TrufflePrintJsonEntry extends PrintJsonEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return JsonPrintNodeGen.create( args.getFirst().exprNode(), - JsonWriter.recurse((Rql2TypeWithProperties) args.getFirst().type(), rawLanguage) + JsonWriter.recurse((SnapiTypeWithProperties) args.getFirst().type(), rawLanguage) .getCallTarget()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java index fdde41658..994cf793f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/json_extension/TruffleReadJsonEntry.java @@ -15,13 +15,13 @@ import java.util.List; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ReadJsonEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ReadJsonEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonReadCollectionNode; import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonReadValueNode; import com.rawlabs.snapi.truffle.ast.io.json.reader.TryableTopLevelWrapper; @@ -32,25 +32,25 @@ public class TruffleReadJsonEntry extends ReadJsonEntry implements TruffleEntryExtension, WithJsonArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode encoding = encoding(args); ExpressionNode timeFormat = timeFormat(args); ExpressionNode dateFormat = dateFormat(args); ExpressionNode timestampFormat = timestampFormat(args); ExpressionNode[] unnamedArgs = mandatoryArgs(args); JsonParser parser = new JsonParser(dateFormat, timeFormat, timestampFormat); - if (type instanceof Rql2IterableType iterableType) { + if (type instanceof SnapiIterableType iterableType) { return new JsonReadCollectionNode( unnamedArgs[0], encoding, - parser.recurse((Rql2TypeWithProperties) iterableType.innerType(), rawLanguage)); + parser.recurse((SnapiTypeWithProperties) iterableType.innerType(), rawLanguage)); } else { JsonReadValueNode parseNode = new JsonReadValueNode( unnamedArgs[0], encoding, - parser.recurse((Rql2TypeWithProperties) type, rawLanguage).getCallTarget()); - if (((Rql2TypeWithProperties) type).props().contains(tryable)) + parser.recurse((SnapiTypeWithProperties) type, rawLanguage).getCallTarget()); + if (((SnapiTypeWithProperties) type).props().contains(tryable)) return new TryableTopLevelWrapper(parseNode); else return parseNode; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java index d3ed35d7b..bda28d260 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoDecodeEntry.java @@ -13,10 +13,10 @@ package com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.KryoDecodeEntry; -import com.rawlabs.snapi.frontend.rql2.source.ExpType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.KryoDecodeEntry; +import com.rawlabs.snapi.frontend.snapi.source.ExpType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.io.kryo.KryoFromNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -25,8 +25,8 @@ public class TruffleKryoDecodeEntry extends KryoDecodeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpType exprType = (ExpType) args.get(1).type(); - return new KryoFromNode(args.get(0).exprNode(), (Rql2TypeWithProperties) exprType.t()); + return new KryoFromNode(args.get(0).exprNode(), (SnapiTypeWithProperties) exprType.t()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java index 923d70226..c0ce6252a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/kryo_extension/TruffleKryoEncodeEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.kryo_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.KryoEncodeEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.KryoEncodeEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.io.kryo.KryoWriteNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleKryoEncodeEntry extends KryoEncodeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { - return new KryoWriteNode(args.get(0).exprNode(), (Rql2TypeWithProperties) args.get(0).type()); + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { + return new KryoWriteNode(args.get(0).exprNode(), (SnapiTypeWithProperties) args.get(0).type()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java index 5965b7b73..1353f8d86 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleBuildListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BuildListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.BuildListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleBuildListEntry extends BuildListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new ListBuildNode( type, args.stream().map(TruffleArg::exprNode).toArray(ExpressionNode[]::new)); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java index 9c0b1a564..589a770e0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleCountListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.CountListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.CountListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListCountNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleCountListEntry extends CountListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ListCountNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java index d1072c3b1..9e8e74583 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleEmptyListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.EmptyListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.EmptyListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleEmptyListEntry extends EmptyListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new ListBuildNode(type, new ExpressionNode[0]); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java index 0f12361bc..d31d52dec 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleExistsListEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ExistsListEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ExistsListEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListExistsNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -26,8 +26,8 @@ public class TruffleExistsListEntry extends ExistsListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java index 7a3cb96ac..0a2cef6d0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFilterListEntry.java @@ -15,10 +15,10 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FilterListEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FilterListEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiListType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFilterNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -28,9 +28,9 @@ public class TruffleFilterListEntry extends FilterListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - Rql2ListType listType = (Rql2ListType) type; - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + SnapiListType listType = (SnapiListType) type; + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); @@ -50,7 +50,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em return new ListFilterNode( truffleArgs.get(0).exprNode(), truffleArgs.get(1).exprNode(), - (Rql2Type) listType.innerType(), + (SnapiType) listType.innerType(), generatorSlot, functionSlot, listSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java index 09384cc9b..cb11662cc 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFirstListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FirstListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FirstListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFirstNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleFirstListEntry extends FirstListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ListFirstNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java index 2e9c8ca1d..e9569ef99 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleFromListEntry.java @@ -15,10 +15,10 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FromListEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FromListEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiListType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -28,9 +28,9 @@ public class TruffleFromListEntry extends FromListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - Rql2ListType rql2ListType = (Rql2ListType) type; - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + SnapiListType snapiListType = (SnapiListType) type; + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); @@ -46,7 +46,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em builder.addSlot(FrameSlotKind.Object, "list", "a slot to store the result array of osr"); return new ListFromNode( truffleArgs.get(0).exprNode(), - (Rql2Type) rql2ListType.innerType(), + (SnapiType) snapiListType.innerType(), generatorSlot, listSlot, currentIdxSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java index 6b40d9af4..2fa1140d4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGetListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.GetListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.GetListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListGetNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleGetListEntry extends GetListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ListGetNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java index cd148442c..5eac8b491 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleGroupListEntry.java @@ -15,9 +15,9 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.GroupListEntry; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.GroupListEntry; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListGroupByNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -30,29 +30,29 @@ public class TruffleGroupListEntry extends GroupListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + List truffleArgs = snapiargsToTruffleArgs(args, emitter); - Rql2ListType listType = (Rql2ListType) type; - Rql2RecordType record = (Rql2RecordType) listType.innerType(); - Rql2AttrType[] atts = - JavaConverters.asJavaCollection(record.atts()).toArray(Rql2AttrType[]::new); + SnapiListType listType = (SnapiListType) type; + SnapiRecordType record = (SnapiRecordType) listType.innerType(); + SnapiAttrType[] atts = + JavaConverters.asJavaCollection(record.atts()).toArray(SnapiAttrType[]::new); - Rql2TypeWithProperties keyType = - (Rql2TypeWithProperties) + SnapiTypeWithProperties keyType = + (SnapiTypeWithProperties) Arrays.stream(atts) .filter(a -> a.idn().equals("key")) .findFirst() - .orElse(Rql2AttrType.apply("key", new Rql2UndefinedType(new HashSet<>()))) + .orElse(SnapiAttrType.apply("key", new SnapiUndefinedType(new HashSet<>()))) .tipe(); - Rql2ListType groupType = - (Rql2ListType) + SnapiListType groupType = + (SnapiListType) Arrays.stream(atts) .filter(a -> a.idn().equals("group")) .findFirst() - .orElse(Rql2AttrType.apply("key", new Rql2UndefinedType(new HashSet<>()))) + .orElse(SnapiAttrType.apply("key", new SnapiUndefinedType(new HashSet<>()))) .tipe(); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); @@ -69,7 +69,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em return new ListGroupByNode( truffleArgs.get(0).exprNode(), truffleArgs.get(1).exprNode(), - (Rql2TypeWithProperties) groupType.innerType(), + (SnapiTypeWithProperties) groupType.innerType(), keyType, generatorSlot, keyFuncSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java index 424d8af88..73d16895f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleLastListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LastListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LastListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListLastNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleLastListEntry extends LastListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ListLastNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java index 22a791131..87dda2da6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMaxListEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MaxListEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MaxListEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -28,8 +28,8 @@ public class TruffleMaxListEntry extends MaxListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java index fa68acd44..569d5e97c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleMinListEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MinListEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MinListEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -28,8 +28,8 @@ public class TruffleMinListEntry extends MinListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java index e5bd6985d..454f4e486 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleSumListEntry.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SumListEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.SumListEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.AggregateSingleNode; import com.rawlabs.snapi.truffle.ast.expressions.aggregation.Aggregations; @@ -28,8 +28,8 @@ public class TruffleSumListEntry extends SumListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java index 3f2425eba..8ff88e124 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTakeListEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.list_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TakeListEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TakeListEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListTakeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleTakeListEntry extends TakeListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ListTakeNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java index b8c5c2b30..da5b0f065 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleTransformListEntry.java @@ -15,10 +15,10 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TransformListEntry; -import com.rawlabs.snapi.frontend.rql2.source.FunType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TransformListEntry; +import com.rawlabs.snapi.frontend.snapi.source.FunType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListTransformNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -28,8 +28,8 @@ public class TruffleTransformListEntry extends TransformListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FunType funType = (FunType) truffleArgs.get(1).type(); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int listSlot = builder.addSlot(FrameSlotKind.Object, "list", "a slot to store the list of osr"); @@ -48,7 +48,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em return new ListTransformNode( truffleArgs.get(0).exprNode(), truffleArgs.get(1).exprNode(), - (Rql2Type) funType.r(), + (SnapiType) funType.r(), listSlot, functionSlot, currentIdxSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java index 9b75dfa20..663cfe81b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/list_extension/TruffleUnsafeFromListEntry.java @@ -15,10 +15,10 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.FrameSlotKind; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.UnsafeFromListEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.UnsafeFromListEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiListType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.iterable.list.ListFromUnsafe; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -29,9 +29,9 @@ public class TruffleUnsafeFromListEntry extends UnsafeFromListEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); - Rql2ListType rql2ListType = (Rql2ListType) type; + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); + SnapiListType snapiListType = (SnapiListType) type; FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); int generatorSlot = builder.addSlot(FrameSlotKind.Object, "generator", "a slot to store the generator of osr"); @@ -47,7 +47,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em builder.addSlot(FrameSlotKind.Object, "list", "a slot to store the result array of osr"); return new ListFromUnsafe( truffleArgs.get(0).exprNode(), - (Rql2Type) rql2ListType.innerType(), + (SnapiType) snapiListType.innerType(), generatorSlot, listSlot, currentIdxSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java index 498062e22..fa200cae6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationDescribeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationDescribeEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LocationDescribeEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationDescribeNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; @@ -25,7 +25,7 @@ public class TruffleLocationDescribeEntry extends LocationDescribeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode sampleSize = args.stream() .filter(a -> a.identifier() != null && a.identifier().contains("sampleSize")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java index dbbdb8ce7..1cbc4a12a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationFromStringEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationFromStringEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LocationFromStringEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromStringNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -25,7 +25,7 @@ public class TruffleLocationFromStringEntry extends LocationFromStringEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode url = args.get(0).exprNode(); return new LocationFromStringNode(url); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java index 82f14585c..65a362978 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLlEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationLlEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LocationLlEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationLlNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleLocationLlEntry extends LocationLlEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return LocationLlNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java index f239011dc..abc6c7b72 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/location_extension/TruffleLocationLsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.location_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LocationLsEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LocationLsEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationLsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleLocationLsEntry extends LocationLsEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return LocationLsNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java index 1042d99b8..92b43fcf4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.long_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LongFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LongFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.long_package.LongFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleLongFromEntry extends LongFromEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return LongFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java index 786fc002e..1b0f8decd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/long_extension/TruffleLongRangeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.long_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LongRangeEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LongRangeEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.long_package.LongRangeNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.LongNode; @@ -24,7 +24,7 @@ public class TruffleLongRangeEntry extends LongRangeEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode start = args.get(0).exprNode(); ExpressionNode end = args.get(1).exprNode(); ExpressionNode step = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java index 1fb9bf830..1cb9bd8a5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAbsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAbsEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathAbsEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAbsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleMathAbsEntry extends MathAbsEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return MathAbsNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java index 799d50dac..51e877809 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAcosEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAcosEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathAcosEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAcosNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java index 3e3ed7647..52f491289 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAsinEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAsinEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathAsinEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAsinNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java index f5f365635..acf38440a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtanEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAtanEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathAtanEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAtanNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java index fc172cbd1..32da03edf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathAtn2Entry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathAtn2Entry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathAtn2Entry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathAtn2NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java index 1c0ecc8e8..8317c5ef9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCeilingEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathCeilingEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathCeilingEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathCeilingNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java index 71f26a26a..00f0088f4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCosEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathCosEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathCosEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathCosNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java index 89601ba51..a19f1717b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathCotEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathCotEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathCotEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathCotNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java index 46edb8daf..697769e6e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathDegreesEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathDegreesEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathDegreesEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathDegreesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java index 4804c91de..ec289a9f1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathExpEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathExpEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathExpEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathExpNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java index 27348d114..3428d462f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathFloorEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathFloorEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathFloorEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathFloorNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java index 033b4561b..a2918890c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLog10Entry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathLog10Entry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathLog10Entry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathLog10NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java index b7ede7f50..d53278431 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathLogEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathLogEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathLogEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathLogNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java index 26a58468d..372630334 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPiEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathPiEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathPiEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.DoubleNode; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java index 1bbc197c6..973c8575b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathPowerEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathPowerEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathPowerEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathPowerNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java index 6bbd82b62..b8b7ffcbd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRadiansEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathRadiansEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathRadiansEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathRadiansNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java index 952210d49..13d582bab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathRandomEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathRandomEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathRandomEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.DoubleNode; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java index 34245f747..d02d3228b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSignEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSignEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathSignEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSignNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java index adba90213..d7bd5fb9a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSinEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSinEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathSinEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSinNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java index d376ea141..f14758182 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSqrtEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSqrtEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathSqrtEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSqrtNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java index 30ad9a838..b625c5fab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathSquareEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathSquareEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathSquareEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathSquareNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java index 9732365a3..ee43e66d6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/math_extension/TruffleMathTanEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.math_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MathTanEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MathTanEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.math_package.MathTanNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java index 2eaba260b..9f5f0cdee 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/mysql_extension/TruffleMySQLQueryEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.mysql_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MySQLQueryEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MySQLQueryEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromMySQLCredentialNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromMySQLNode; @@ -30,7 +30,7 @@ public class TruffleMySQLQueryEntry extends MySQLQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java index 8a343dea8..f42d7dcb3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableBuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableBuildEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.NullableBuildEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionSomeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleNullableBuildEntry extends NullableBuildEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return OptionSomeNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java index b2199862d..9c05bf79f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableEmptyEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableEmptyEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.NullableEmptyEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionNoneNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleNullableEmptyEntry extends NullableEmptyEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new OptionNoneNode(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java index a6f826bc1..156758c62 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableIsNullEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableIsNullEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.NullableIsNullEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionIsDefinedNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.unary.NotNodeGen; @@ -24,7 +24,7 @@ public class TruffleNullableIsNullEntry extends NullableIsNullEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return NotNodeGen.create(OptionIsDefinedNodeGen.create(args.get(0).exprNode())); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java index 6dc2770dd..a25709c1d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableTransformEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableTransformEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.NullableTransformEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionMapNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleNullableTransformEntry extends NullableTransformEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return OptionMapNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java index 78b59b4ea..85ac64f6c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_extension/TruffleNullableUnsafeGetEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.nullable_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.NullableUnsafeGetEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.NullableUnsafeGetEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionUnsafeGetNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleNullableUnsafeGetEntry extends NullableUnsafeGetEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return OptionUnsafeGetNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java index 8e3c25c7c..6c0829fb8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/nullable_tryable_extension/TruffleFlatMapNullableTryableEntry.java @@ -15,10 +15,10 @@ import static com.rawlabs.snapi.truffle.emitter.builtin.CompilerScalaConsts.*; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FlatMapNullableTryableEntry; -import com.rawlabs.snapi.frontend.rql2.source.FunType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FlatMapNullableTryableEntry; +import com.rawlabs.snapi.frontend.snapi.source.FunType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionFlatMapNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionGetOrElseNodeGen; @@ -35,11 +35,11 @@ public class TruffleFlatMapNullableTryableEntry extends FlatMapNullableTryableEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - Rql2TypeWithProperties eType = (Rql2TypeWithProperties) args.get(0).t(); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + SnapiTypeWithProperties eType = (SnapiTypeWithProperties) args.get(0).t(); FunType fType = (FunType) args.get(1).t(); - Rql2TypeWithProperties inType = (Rql2TypeWithProperties) fType.ms().apply(0); - Rql2TypeWithProperties outType = (Rql2TypeWithProperties) fType.r(); + SnapiTypeWithProperties inType = (SnapiTypeWithProperties) fType.ms().apply(0); + SnapiTypeWithProperties outType = (SnapiTypeWithProperties) fType.r(); // The value is try+nullable, and both properties need to be checked before applying the // function. diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java index 4d6b66155..9656a4160 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/oracle_extension/TruffleOracleQueryEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.oracle_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OracleQueryEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.OracleQueryEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromOracleCredentialNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromOracleNode; @@ -30,7 +30,7 @@ public class TruffleOracleQueryEntry extends OracleQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java index ee4e5e534..7a312a2bb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/postgresql_extension/TrufflePostgreSQLQueryEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.postgresql_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.PostgreSQLQueryEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.PostgreSQLQueryEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromPostgreSQLCredentialNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromPostgreSQLNode; @@ -30,7 +30,7 @@ public class TrufflePostgreSQLQueryEntry extends PostgreSQLQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java index 71afdf2fd..1ce3fc40f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordAddFieldEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordAddFieldEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordAddFieldEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiRecordType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordAddFieldNodeGen; @@ -26,8 +26,8 @@ public class TruffleRecordAddFieldEntry extends RecordAddFieldEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { - Rql2RecordType recordType = (Rql2RecordType) type; + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { + SnapiRecordType recordType = (SnapiRecordType) type; String f = recordType.atts().last().idn(); StringNode fieldName = new StringNode(f); ExpressionNode value = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java index 26d46b30f..9355fed97 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordBuildEntry.java @@ -13,10 +13,10 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordBuildEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordBuildEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiAttrType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiRecordType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -26,13 +26,13 @@ public class TruffleRecordBuildEntry extends RecordBuildEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { - Rql2RecordType recordType = (Rql2RecordType) type; + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { + SnapiRecordType recordType = (SnapiRecordType) type; String[] fieldNames = JavaConverters.asJavaCollection(recordType.atts()).stream() - .map(a -> (Rql2AttrType) a) - .map(Rql2AttrType::idn) + .map(a -> (SnapiAttrType) a) + .map(SnapiAttrType::idn) .toList() .toArray(new String[0]); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java index 0a0403b23..bb98045a7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordConcatEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordConcatEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordConcatEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordConcatNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleRecordConcatEntry extends RecordConcatEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RecordConcatNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java index ea3840a2b..26d635b7c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordFieldsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordFieldsEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordFieldsEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordFieldsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleRecordFieldsEntry extends RecordFieldsEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RecordFieldsNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java index 4399781a9..f3eb57488 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordGetFieldByIndexEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordGetFieldByIndexEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordGetFieldByIndexEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordProjNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleRecordGetFieldByIndexEntry extends RecordGetFieldByIndexEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RecordProjNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java index 8e73bdbae..135432a74 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/record_extension/TruffleRecordRemoveFieldEntry.java @@ -13,10 +13,10 @@ package com.rawlabs.snapi.truffle.emitter.builtin.record_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordRemoveFieldEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2AttrType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2RecordType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordRemoveFieldEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiAttrType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiRecordType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordRemoveFieldNodeGen; @@ -29,19 +29,19 @@ public class TruffleRecordRemoveFieldEntry extends RecordRemoveFieldEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { - Rql2RecordType recordType = (Rql2RecordType) type; + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { + SnapiRecordType recordType = (SnapiRecordType) type; List finalFieldNames = JavaConverters.asJavaCollection(recordType.atts()).stream() - .map(a -> (Rql2AttrType) a) - .map(Rql2AttrType::idn) + .map(a -> (SnapiAttrType) a) + .map(SnapiAttrType::idn) .distinct() .toList(); - Rql2RecordType original = (Rql2RecordType) args.get(0).type(); + SnapiRecordType original = (SnapiRecordType) args.get(0).type(); String[] originalFieldNames = JavaConverters.asJavaCollection(original.atts()).stream() - .map(a -> (Rql2AttrType) a) - .map(Rql2AttrType::idn) + .map(a -> (SnapiAttrType) a) + .map(SnapiAttrType::idn) .distinct() .toArray(String[]::new); String f = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java index f6e222c7e..29b5c1cb6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexFirstMatchInEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexFirstMatchInEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RegexFirstMatchInEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexFirstMatchInNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -23,7 +23,7 @@ public class TruffleRegexFirstMatchInEntry extends RegexFirstMatchInEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RegexFirstMatchInNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java index 67fa2aa17..b1adf1f4a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexGroupsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexGroupsEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RegexGroupsEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexGroupsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleRegexGroupsEntry extends RegexGroupsEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RegexGroupsNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java index fdb2dc9a1..dfacc9ed9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexMatchesEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexMatchesEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RegexMatchesEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexMatchesNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleRegexMatchesEntry extends RegexMatchesEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RegexMatchesNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java index 7d41001f3..54f81245f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/regex_extension/TruffleRegexReplaceEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.regex_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RegexReplaceEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RegexReplaceEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.regex_package.RegexReplaceNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleRegexReplaceEntry extends RegexReplaceEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return RegexReplaceNodeGen.create( args.get(0).exprNode(), args.get(1).exprNode(), args.get(2).exprNode()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java index 73ef17a87..93311b638 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/s3_extension/TruffleS3BuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.s3_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.S3BuildEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.S3BuildEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromS3Node; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleS3BuildEntry extends S3BuildEntry implements TruffleEntryExtension, WithArgs { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode url = args.get(0).exprNode(); ExpressionNode accessKey = arg(args, "accessKey").orElse(null); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java index 3428f443c..72c34f523 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/short_extension/TruffleShortFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.short_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ShortFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ShortFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.short_package.ShortFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleShortFromEntry extends ShortFromEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return ShortFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java index 686ad969b..ca9d5579e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/snowflake_extension/TruffleSnowflakeQueryEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.snowflake_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SnowflakeQueryEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.SnowflakeQueryEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSnowflakeCredentialNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSnowflakeNode; @@ -29,7 +29,7 @@ public class TruffleSnowflakeQueryEntry extends SnowflakeQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java index 592f4b51a..c0bf16c55 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/sqlserver_extension/TruffleSQLServerQueryEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.sqlserver_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SQLServerQueryEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.SQLServerQueryEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSQLServerCredentialNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.location_package.LocationFromSQLServerNode; @@ -30,7 +30,7 @@ public class TruffleSQLServerQueryEntry extends SQLServerQueryEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode db = args.get(0).exprNode(); ExpressionNode query = args.get(1).exprNode(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java index 5c12b60aa..31b536b00 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleBase64EntryExtension.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.Base64EntryExtension; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.Base64EntryExtension; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringBase64NodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java index 55fe4dfb1..6953900ff 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCapitalizeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringCapitalizeEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringCapitalizeEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringCapitalizeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java index 2fbca44e5..908e18fa2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringContainsEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringContainsEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringContainsEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringContainsNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java index ed4584538..8ae4c96a7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringCountSubStringEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringCountSubStringEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringCountSubStringEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringCountSubStringNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java index 2a40971d9..e3a283870 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringDecodeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringDecodeEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringDecodeEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringDecodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java index 01f96487b..07bb9a9d5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEmptyEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringEmptyEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringEmptyEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringEmptyNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java index e167343cc..0ba3c9bbb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringEncodeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringEncodeEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringEncodeEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringEncodeNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java index a85e3add1..97a6bf07d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringFromEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringFromEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringFromEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringFromNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleStringFromEntry extends StringFromEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return StringFromNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java index 2b98328bc..39aaeb06f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLTrimEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLTrimEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringLTrimEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLTrimNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java index f1d73e93e..979e0af9c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLengthEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLengthEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringLengthEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLengthNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java index 519fad696..67fb6ce7b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLevenshteinDistanceEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLevenshteinDistanceEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringLevenshteinDistanceEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLevenshteinDistanceNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java index 46c416590..27e033ef6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringLowerEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringLowerEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringLowerEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringLowerNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java index 4241c1473..6eea1abb3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringRTrimEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringRTrimEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringRTrimEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringRTrimNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java index 04c97c218..2131ffed5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReadEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringReadEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReadNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; @@ -23,7 +23,7 @@ import java.util.List; public class TruffleStringReadEntry extends StringReadEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode encoding = args.stream() .filter(arg -> arg.identifier() != null && arg.identifier().equals("encoding")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java index 62959b0a2..f8cc52c9f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReadLinesEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReadLinesEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringReadLinesEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReadLinesNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; @@ -24,7 +24,7 @@ public class TruffleStringReadLinesEntry extends StringReadLinesEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode encoding = args.stream() .filter(arg -> arg.identifier() != null && arg.identifier().equals("encoding")) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java index 9f2eddf33..e0c86ec32 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplaceEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReplaceEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringReplaceEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReplaceNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleStringReplaceEntry extends StringReplaceEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return StringReplaceNodeGen.create( args.get(0).exprNode(), args.get(1).exprNode(), args.get(2).exprNode()); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java index ac0cf0fc7..30fcd782f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReplicateEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReplicateEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringReplicateEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReplicateNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java index a9d5ae3ca..0797bb9ee 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringReverseEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringReverseEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringReverseEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringReverseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java index 5d4c69aed..b3e1e0436 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSplitEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringSplitEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringSplitEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringSplitNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java index bc46b8016..7c5082e42 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringStartsWithEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringStartsWithEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringStartsWithEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringStartsWithNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java index 2a5707ede..9218bf09c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringSubStringEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringSubStringEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringSubStringEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringSubStringNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java index 07c9e90e0..327a2bea7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringTrimEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringTrimEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringTrimEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringTrimNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java index 9103d9110..ca6b7666c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/string_extension/TruffleStringUpperEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.string_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringUpperEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringUpperEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.string_package.StringUpperNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java index a4747f947..f9c677770 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/success_extension/TruffleSuccessBuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.success_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.SuccessBuildEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.SuccessBuildEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableSuccessNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleSuccessBuildEntry extends SuccessBuildEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableSuccessNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java index 6adac6e7d..f9fad4c94 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleBoolValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.BoolValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.BoolValueArgTestEntry; public class TruffleBoolValueArgTestEntry extends BoolValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java index 93d96ec51..35c9cd8c0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleByteValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ByteValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ByteValueArgTestEntry; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; public class TruffleByteValueArgTestEntry extends ByteValueArgTestEntry diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java index d661afcde..1d5725d31 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDateValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DateValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DateValueArgTestEntry; public class TruffleDateValueArgTestEntry extends DateValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java index 00dcbdd68..b4b04f356 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleDoubleValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.DoubleValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.DoubleValueArgTestEntry; public class TruffleDoubleValueArgTestEntry extends DoubleValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java index c006b97ff..53fcc2de3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleFloatValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.FloatValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.FloatValueArgTestEntry; public class TruffleFloatValueArgTestEntry extends FloatValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java index b23066cd2..e564b06e6 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntValueArgTestEntry.java @@ -12,6 +12,6 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntValueArgTestEntry; public class TruffleIntValueArgTestEntry extends IntValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java index b9666890a..b72b11cc4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleIntervalValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.IntervalValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.IntervalValueArgTestEntry; public class TruffleIntervalValueArgTestEntry extends IntervalValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java index d810f100a..c58b7142d 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleListValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ListValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ListValueArgTestEntry; public class TruffleListValueArgTestEntry extends ListValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java index 88853b132..9b41fed9f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleLongValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.LongValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.LongValueArgTestEntry; public class TruffleLongValueArgTestEntry extends LongValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java index 85ff0189e..f29aecb3e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryArgs.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ public interface TruffleMandatoryArgs extends TruffleEntryExtension { @Override - default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new PlusNode(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java index 04465d33b..c0401edce 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryExpArgsEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MandatoryExpArgsEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MandatoryExpArgsEntry; public class TruffleMandatoryExpArgsEntry extends MandatoryExpArgsEntry implements TruffleMandatoryArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java index 30da71683..2270585e4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleMandatoryValueArgsEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.MandatoryValueArgsEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.MandatoryValueArgsEntry; public class TruffleMandatoryValueArgsEntry extends MandatoryValueArgsEntry implements TruffleMandatoryArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java index 05e57487c..08c705dc8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalArgs.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.MultNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; @@ -24,7 +24,7 @@ public interface TruffleOptionalArgs extends TruffleEntryExtension, WithArgs { @Override - default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode mandatory = mandatoryArgs(args)[0]; ExpressionNode x = arg(args, "x").orElse(new IntNode("10")); ExpressionNode y = arg(args, "y").orElse(new IntNode("10")); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java index 19fb5879f..372cc9268 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalExpArgsTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OptionalExpArgsTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.OptionalExpArgsTestEntry; public class TruffleOptionalExpArgsTestEntry extends OptionalExpArgsTestEntry implements TruffleOptionalArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java index 66239ad39..76c78341b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleOptionalValueArgsTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.OptionalValueArgsTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.OptionalValueArgsTestEntry; public class TruffleOptionalValueArgsTestEntry extends OptionalValueArgsTestEntry implements TruffleOptionalArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java index cd89dc68d..e21f925bb 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleRecordValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.RecordValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.RecordValueArgTestEntry; public class TruffleRecordValueArgTestEntry extends RecordValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java index 36d018b19..3ef88a5ff 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleShortValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ShortValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ShortValueArgTestEntry; public class TruffleShortValueArgTestEntry extends ShortValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java index 48aa70275..99416e850 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsColPassThroughTestEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StrictArgsColPassThroughTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StrictArgsColPassThroughTestEntry; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.MultNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.iterable.collection.CollectionTransformNodeGen; @@ -27,7 +27,7 @@ public class TruffleStrictArgsColPassThroughTestEntry extends StrictArgsColPassThroughTestEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { return CollectionTransformNodeGen.create( emitter.recurseExp(args.get(0).e()), emitter.recurseLambda(() -> MultNodeGen.create(new ReadParamNode(0), new IntNode("10")))); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java index 9f51d0892..31dd57340 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStrictArgsTestEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StrictArgsTestEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StrictArgsTestEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.numeric.float_package.FloatFromNodeGen; @@ -32,7 +32,7 @@ public class TruffleStrictArgsTestEntry extends StrictArgsTestEntry implements TruffleEntryExtension, WithArgs { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode listArg = args.get(0).exprNode(); ExpressionNode[] optionalArgs = optionalArgs(args); ExpressionNode recordArg = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java index 04a0f44f8..205a63933 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleStringValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.StringValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.StringValueArgTestEntry; public class TruffleStringValueArgTestEntry extends StringValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java index 525fa178f..3a6ba5024 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimeValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeValueArgTestEntry; public class TruffleTimeValueArgTestEntry extends TimeValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java index 192e7ec37..03b2521a0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleTimestampValueArgTestEntry.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampValueArgTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampValueArgTestEntry; public class TruffleTimestampValueArgTestEntry extends TimestampValueArgTestEntry implements TruffleValueArg {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java index 9c8c3af99..ec00c8efd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleValueArg.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.record.RecordBuildNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ public interface TruffleValueArg extends TruffleEntryExtension { @Override - default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return new RecordBuildNode(new ExpressionNode[] {args.get(0).exprNode()}, new String[] {"arg"}); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java index 5058f8e39..393fc963e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarArgs.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.IntNode; @@ -23,7 +23,7 @@ public interface TruffleVarArgs extends TruffleEntryExtension { @Override - default ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + default ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode result = new IntNode("0"); for (TruffleArg arg : args) { result = new PlusNode(result, arg.exprNode()); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java index 9f9afdfa4..d26f2efcf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarExpArgsTestEntry.java @@ -12,6 +12,6 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarExpArgsTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.VarExpArgsTestEntry; public class TruffleVarExpArgsTestEntry extends VarExpArgsTestEntry implements TruffleVarArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java index d2f485935..9514dd2af 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringExpTestEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarNullableStringExpTestEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.VarNullableStringExpTestEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; @@ -23,7 +23,7 @@ public class TruffleVarNullableStringExpTestEntry extends VarNullableStringExpTestEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return args.get(0).exprNode(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java index 17f7fe769..832c74aa5 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarNullableStringValueTestEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarNullableStringValueTestEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.VarNullableStringValueTestEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.binary.PlusNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.StringNode; @@ -26,7 +26,7 @@ public class TruffleVarNullableStringValueTestEntry extends VarNullableStringValueTestEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode result = new StringNode(""); for (TruffleArg arg : args) { result = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java index 0c4907ac9..bf5729ff0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/test_extension/TruffleVarValueArgsTestEntry.java @@ -12,6 +12,6 @@ package com.rawlabs.snapi.truffle.emitter.builtin.test_extension; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.VarValueArgsTestEntry; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.VarValueArgsTestEntry; public class TruffleVarValueArgsTestEntry extends VarValueArgsTestEntry implements TruffleVarArgs {} diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java index 2337f69db..4838d8334 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeAddIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeAddIntervalEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeAddIntervalEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeAddIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java index ab6d7955b..9899b45c4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeBuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeBuildEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeBuildEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeBuildNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java index 5758fb1c1..9701beba3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeHourEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeHourEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeHourEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeHourNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java index 479113f70..09277f348 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMillisEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeMillisEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeMillisEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java index a24449e1b..3079cb5af 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeMinuteEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeMinuteEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeMinuteEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeMinuteNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java index 09de423f5..f275bf2f9 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeNowEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeNowEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeNowEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeNowNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java index 984bcd20c..ff57add8a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeParseEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeParseEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeParseEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java index a704ee3a4..c1929a155 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSecondEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeSecondEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeSecondEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeSecondNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java index 42001044f..a27ad5bf3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeSubtractEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeSubtractEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeSubtractNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java index fc66a0f4f..4708163e3 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/time_extension/TruffleTimeSubtractIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.time_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimeSubtractIntervalEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimeSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.time_package.TimeSubtractIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java index ce894c38e..23eced2b7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampAddIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampAddIntervalEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampAddIntervalEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampAddIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java index 6dfe2c6f3..bd2c0899e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampBuildEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampBuildEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampBuildEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampBuildNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java index 6f925b252..535860de4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampDayEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampDayEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampDayEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampDayNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java index e591c4723..823b43eda 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromDateEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampFromDateEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampFromDateEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampFromDateNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java index d49ba3996..427083c2a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampFromUnixTimestampEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampFromUnixTimestampEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampFromUnixTimestampEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampFromUnixTimestampNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java index 31446257b..1e1208c5e 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampHourEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampHourEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampHourEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampHourNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java index f502258d9..b3b7b04b1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMillisEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampMillisEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampMillisEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMillisNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java index 9bc2a119a..7af55ffcd 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMinuteEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampMinuteEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampMinuteEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMinuteNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java index 4b16d8f37..1607be559 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampMonthEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampMonthEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampMonthEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampMonthNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java index 84addfdf9..9a265ca20 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampNowEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampNowEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampNowEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampNowNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java index 20a617c98..1550ffcd2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampParseEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampParseEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampParseEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampParseNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java index 4bed1fd32..49d6a4616 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampRangeEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampRangeEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampRangeEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.interval_package.IntervalBuildNodeGen; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampRangeNodeGen; @@ -37,7 +37,7 @@ public class TruffleTimestampRangeEntry extends TimestampRangeEntry new IntNode("0"), new IntNode("0")); - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpressionNode start = args.get(0).exprNode(); ExpressionNode end = args.get(1).exprNode(); ExpressionNode step = diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java index b4af2335a..e0795f206 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSecondEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampSecondEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampSecondEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSecondNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java index 53f141a24..08f7977f1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampSubtractEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampSubtractEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java index b055ebe2d..8cb904890 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampSubtractIntervalEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampSubtractIntervalEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampSubtractIntervalEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampSubtractIntervalNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java index 3aecdc5cc..cedae56a4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampTimeBucketEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampTimeBucketEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IntervalType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2StringType; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampTimeBucketEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIntervalType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiStringType; import com.rawlabs.snapi.truffle.emitter.TruffleArg; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampTimeBucketIntervalNodeGen; @@ -27,12 +27,12 @@ import java.util.List; public class TruffleTimestampTimeBucketEntry extends TimestampTimeBucketEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return switch (args.get(0).type()) { - case Rql2StringType ignored -> + case SnapiStringType ignored -> TimestampTimeBucketStringNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); - case Rql2IntervalType ignored -> + case SnapiIntervalType ignored -> TimestampTimeBucketIntervalNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); default -> throw new TruffleInternalErrorException(); }; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java index d0509a00d..e064067ca 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampToUnixTimestampEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampToUnixTimestampEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampToUnixTimestampEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampToUnixTimestampNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java index 0536bc0c6..f2c821e34 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/timestamp_extension/TruffleTimestampYearEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.timestamp_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TimestampYearEntry; -import com.rawlabs.snapi.frontend.rql2.source.Exp; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TimestampYearEntry; +import com.rawlabs.snapi.frontend.snapi.source.Exp; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.temporals.timestamp_package.TimestampYearNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleShortEntryExtension; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java index e58240761..0a1d98b66 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryFlatMapEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryFlatMapEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TryFlatMapEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableMapNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleTryFlatMapEntry extends TryFlatMapEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableMapNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java index 6fe7045a2..80c50522f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsErrorEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryIsErrorEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TryIsErrorEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableIsFailureNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleTryIsErrorEntry extends TryIsErrorEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableIsFailureNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java index 1526f0eab..31a773c6b 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryIsSuccessEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryIsSuccessEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TryIsSuccessEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableIsSuccessNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleTryIsSuccessEntry extends TryIsSuccessEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableIsSuccessNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java index ade025963..078476ee0 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryTransformEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryTransformEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TryTransformEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableMapNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleTryTransformEntry extends TryTransformEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableMapNodeGen.create(args.get(0).exprNode(), args.get(1).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java index 6dd6b26d7..5fa6a7d13 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/try_extension/TruffleTryUnsafeGetEntry.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.builtin.try_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TryUnsafeGetEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TryUnsafeGetEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.tryable.TryableUnsafeGetNodeGen; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -22,7 +22,7 @@ import java.util.List; public class TruffleTryUnsafeGetEntry extends TryUnsafeGetEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return TryableUnsafeGetNodeGen.create(args.get(0).exprNode()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java index a10c60a57..a9920cefa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeCastEntry.java @@ -13,15 +13,15 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeCastEntry; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TypeCastEntry; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import java.util.List; public class TruffleTypeCastEntry extends TypeCastEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { return args.get(1).exprNode(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java index f0d67c3d8..0fa4be312 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeEmptyEntry.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeEmptyEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TypeEmptyEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.literals.ZeroedConstNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -24,7 +24,7 @@ public class TruffleTypeEmptyEntry extends TypeEmptyEntry implements TruffleEntryExtension { @Override - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { - return new ZeroedConstNode((Rql2Type) args.getFirst().type()); + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { + return new ZeroedConstNode((SnapiType) args.getFirst().type()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java index 9f2e46005..ac828cd7f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeMatchEntry.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.TypesMerger; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeMatchEntry; -import com.rawlabs.snapi.frontend.rql2.source.FunType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2OrType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.TypesMerger; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TypeMatchEntry; +import com.rawlabs.snapi.frontend.snapi.source.FunType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiOrType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package.TypeMatchNode; import com.rawlabs.snapi.truffle.emitter.TruffleArg; @@ -31,8 +31,8 @@ public class TruffleTypeMatchEntry extends TypeMatchEntry implements TruffleEntr private record Handler(int idx, TruffleArg arg) {} - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { - Rql2OrType orType = (Rql2OrType) args.get(0).type(); + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { + SnapiOrType orType = (SnapiOrType) args.get(0).type(); ExpressionNode[] handlers = args.stream() .skip(1) diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java index f93dfc71d..c60eceeab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/type_extension/TruffleTypeProtectCastEntry.java @@ -13,12 +13,12 @@ package com.rawlabs.snapi.truffle.emitter.builtin.type_extension; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.TypeProtectCastEntry; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.TypeProtectCastEntry; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package.TypeProtectCastOptionNode; import com.rawlabs.snapi.truffle.ast.expressions.builtin.type_package.TypeProtectCastTryableNode; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; @@ -30,66 +30,66 @@ public class TruffleTypeProtectCastEntry extends TypeProtectCastEntry implements TruffleEntryExtension { - public ExpressionNode toTruffle(Type type, List args, Rql2Language rawLanguage) { + public ExpressionNode toTruffle(Type type, List args, SnapiLanguage rawLanguage) { ExpType expSourceType = (ExpType) args.get(0).type(); ExpType expTargetType = (ExpType) args.get(1).type(); Type sourceType = expSourceType.t(); Type targetType = expTargetType.t(); ExpressionNode e = args.get(2).exprNode(); - Set extraProps = extraProps(targetType, sourceType); - if (extraProps.equals(Set.of(new Rql2IsTryableTypeProperty()))) { + Set extraProps = extraProps(targetType, sourceType); + if (extraProps.equals(Set.of(new SnapiIsTryableTypeProperty()))) { return new TypeProtectCastTryableNode(e); - } else if (extraProps.equals(Set.of(new Rql2IsNullableTypeProperty()))) { + } else if (extraProps.equals(Set.of(new SnapiIsNullableTypeProperty()))) { return new TypeProtectCastOptionNode(e); } else { return new TypeProtectCastTryableNode(new TypeProtectCastOptionNode(e)); } } - private Set extraProps(Type target, Type source) { + private Set extraProps(Type target, Type source) { return switch (source) { - case Rql2ListType sourceType -> { - Rql2ListType targetType = (Rql2ListType) target; - Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); - Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); - Set innerProps = extraProps(targetType.innerType(), sourceType.innerType()); + case SnapiListType sourceType -> { + SnapiListType targetType = (SnapiListType) target; + Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); + Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); + Set innerProps = extraProps(targetType.innerType(), sourceType.innerType()); sourceProps.removeAll(targetProps); - Set finalProps = new HashSet<>(innerProps); + Set finalProps = new HashSet<>(innerProps); finalProps.addAll(sourceProps); yield finalProps; } - case Rql2IterableType sourceType -> { - Rql2IterableType targetType = (Rql2IterableType) target; + case SnapiIterableType sourceType -> { + SnapiIterableType targetType = (SnapiIterableType) target; // inner types aren't checked because iterables aren't consumed in the moment they're passed to // the function. No exception will be raised under ProtectCast regarding an iterable's items. - Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); - Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); - Set finalProps = new HashSet<>(sourceProps); + Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); + Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); + Set finalProps = new HashSet<>(sourceProps); finalProps.removeAll(targetProps); yield finalProps; } - case Rql2RecordType sourceType -> { - Rql2RecordType targetType = (Rql2RecordType) target; - Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); - Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); - Set finalProps = new HashSet<>(sourceProps); + case SnapiRecordType sourceType -> { + SnapiRecordType targetType = (SnapiRecordType) target; + Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); + Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); + Set finalProps = new HashSet<>(sourceProps); finalProps.removeAll(targetProps); - List sourceTypes = JavaConverters.seqAsJavaList(sourceType.atts()).stream().map(Rql2AttrType::tipe).toList(); - List targetTypes = JavaConverters.seqAsJavaList(targetType.atts()).stream().map(Rql2AttrType::tipe).toList(); + List sourceTypes = JavaConverters.seqAsJavaList(sourceType.atts()).stream().map(SnapiAttrType::tipe).toList(); + List targetTypes = JavaConverters.seqAsJavaList(targetType.atts()).stream().map(SnapiAttrType::tipe).toList(); assert sourceTypes.size() == targetTypes.size(); for (int i = 0; i < sourceTypes.size(); i++) { Type sourceAttrType = sourceTypes.get(i); Type targetAttrType = targetTypes.get(i); - Set innerProps = extraProps(targetAttrType, sourceAttrType); + Set innerProps = extraProps(targetAttrType, sourceAttrType); finalProps.addAll(innerProps); } yield finalProps; } - case Rql2TypeWithProperties sourceType -> { - Rql2TypeWithProperties targetType = (Rql2TypeWithProperties) target; - Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); - Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); - Set finalProps = new HashSet<>(sourceProps); + case SnapiTypeWithProperties sourceType -> { + SnapiTypeWithProperties targetType = (SnapiTypeWithProperties) target; + Set sourceProps = JavaConverters.setAsJavaSet(sourceType.props()); + Set targetProps = JavaConverters.setAsJavaSet(targetType.props()); + Set finalProps = new HashSet<>(sourceProps); finalProps.removeAll(targetProps); yield finalProps; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java index 2926649bd..a18748303 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleParseXmlEntry.java @@ -16,12 +16,12 @@ import com.oracle.truffle.api.frame.FrameSlotKind; import java.util.List; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ParseXmlEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ParseXmlEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiListType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; @@ -50,8 +50,8 @@ private static ExpressionNode getArg( private static final ExpressionNode defaultDateFormat = new StringNode("yyyy-M-d"); private static final ExpressionNode defaultTimeFormat = new StringNode("HH:mm[:ss[.SSS]]"); - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); List unnamedArgs = @@ -65,7 +65,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em getArg(namedArgs, "timestampFormat", defaultTimestampFormat); return switch (type) { - case Rql2IterableType iterableType -> { + case SnapiIterableType iterableType -> { ExpressionNode parseNode = new XmlParseCollectionNode( unnamedArgs.get(0).exprNode(), @@ -73,7 +73,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em timeFormatExp, timestampFormatExp, XmlRecurse.recurseXmlParser( - (Rql2TypeWithProperties) iterableType.innerType(), emitter.getLanguage())); + (SnapiTypeWithProperties) iterableType.innerType(), emitter.getLanguage())); if (XmlRecurse.isTryable(iterableType)) { // Probably will need to be either reused in json and xml or create a copy yield new TryableTopLevelWrapper(parseNode); @@ -81,7 +81,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em yield parseNode; } } - case Rql2ListType listType -> { + case SnapiListType listType -> { ExpressionNode parseNode = new XmlParseCollectionNode( unnamedArgs.get(0).exprNode(), @@ -89,7 +89,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em timeFormatExp, timestampFormatExp, XmlRecurse.recurseXmlParser( - (Rql2TypeWithProperties) listType.innerType(), emitter.getLanguage())); + (SnapiTypeWithProperties) listType.innerType(), emitter.getLanguage())); int generatorSlot = builder.addSlot( @@ -111,7 +111,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em // Probably will need to be either reused in json and xml or create a copy yield new ListFromNode( parseNode, - (Rql2Type) listType.innerType(), + (SnapiType) listType.innerType(), generatorSlot, listSlot, currentIdxSlot, @@ -120,7 +120,7 @@ yield new ListFromNode( } else { yield new ListFromUnsafe( parseNode, - (Rql2Type) listType.innerType(), + (SnapiType) listType.innerType(), generatorSlot, listSlot, currentIdxSlot, @@ -128,7 +128,7 @@ yield new ListFromUnsafe( resultSlot); } } - case Rql2TypeWithProperties t -> { + case SnapiTypeWithProperties t -> { ExpressionNode parseNode = new XmlParseValueNode( unnamedArgs.get(0).exprNode(), diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java index d3111986a..00248d6f8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/TruffleReadXmlEntry.java @@ -16,12 +16,12 @@ import com.oracle.truffle.api.frame.FrameSlotKind; import java.util.List; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.extensions.Rql2Arg; -import com.rawlabs.snapi.frontend.rql2.extensions.builtin.ReadXmlEntry; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IterableType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2ListType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2Type; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.extensions.SnapiArg; +import com.rawlabs.snapi.frontend.snapi.extensions.builtin.ReadXmlEntry; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIterableType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiListType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.emitter.TruffleArg; import com.rawlabs.snapi.truffle.emitter.TruffleEmitter; import com.rawlabs.snapi.truffle.emitter.TruffleEntryExtension; @@ -51,8 +51,8 @@ private static ExpressionNode getArg( private static final ExpressionNode defaultTimeFormat = new StringNode("HH:mm[:ss[.SSS]]"); @Override - public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { - List truffleArgs = rql2argsToTruffleArgs(args, emitter); + public ExpressionNode toTruffle(Type type, List args, TruffleEmitter emitter) { + List truffleArgs = snapiargsToTruffleArgs(args, emitter); FrameDescriptor.Builder builder = emitter.getFrameDescriptorBuilder(); List unnamedArgs = @@ -66,7 +66,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em getArg(namedArgs, "timestampFormat", defaultTimestampFormat); return switch (type) { - case Rql2IterableType iterableType -> { + case SnapiIterableType iterableType -> { ExpressionNode parseNode = new XmlReadCollectionNode( unnamedArgs.get(0).exprNode(), @@ -75,7 +75,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em timeFormatExp, timestampFormatExp, XmlRecurse.recurseXmlParser( - (Rql2TypeWithProperties) iterableType.innerType(), emitter.getLanguage())); + (SnapiTypeWithProperties) iterableType.innerType(), emitter.getLanguage())); if (XmlRecurse.isTryable(iterableType)) { // Probably will need to be either reused in json and xml or create a copy yield new TryableTopLevelWrapper(parseNode); @@ -83,7 +83,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em yield parseNode; } } - case Rql2ListType listType -> { + case SnapiListType listType -> { ExpressionNode parseNode = new XmlReadCollectionNode( unnamedArgs.get(0).exprNode(), @@ -92,7 +92,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em timeFormatExp, timestampFormatExp, XmlRecurse.recurseXmlParser( - (Rql2TypeWithProperties) listType.innerType(), emitter.getLanguage())); + (SnapiTypeWithProperties) listType.innerType(), emitter.getLanguage())); int generatorSlot = builder.addSlot( @@ -114,7 +114,7 @@ public ExpressionNode toTruffle(Type type, List args, TruffleEmitter em // Probably will need to be either reused in json and xml or create a copy yield new ListFromNode( parseNode, - (Rql2Type) listType.innerType(), + (SnapiType) listType.innerType(), generatorSlot, listSlot, currentIdxSlot, @@ -123,7 +123,7 @@ yield new ListFromNode( } else { yield new ListFromUnsafe( parseNode, - (Rql2Type) listType.innerType(), + (SnapiType) listType.innerType(), generatorSlot, listSlot, currentIdxSlot, @@ -131,7 +131,7 @@ yield new ListFromUnsafe( resultSlot); } } - case Rql2TypeWithProperties t -> { + case SnapiTypeWithProperties t -> { ExpressionNode parseNode = new XmlReadValueNode( unnamedArgs.get(0).exprNode(), diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java index e6a8acd52..a9a021adf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/builtin/xml_extension/XmlRecurse.java @@ -13,9 +13,9 @@ package com.rawlabs.snapi.truffle.emitter.builtin.xml_extension; import com.oracle.truffle.api.frame.FrameDescriptor; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.ast.ExpressionNode; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ProgramExpressionNode; import com.rawlabs.snapi.truffle.ast.expressions.option.OptionSomeNodeGen; import com.rawlabs.snapi.truffle.ast.io.xml.parser.*; @@ -26,46 +26,46 @@ public class XmlRecurse { - private static ExpressionNode primitiveParserNode(Rql2TypeWithProperties tipe) { + private static ExpressionNode primitiveParserNode(SnapiTypeWithProperties tipe) { return switch (tipe) { - case Rql2UndefinedType v -> UndefinedParseXmlNodeGen.create(); - case Rql2ByteType v -> ByteParseXmlNodeGen.create(); - case Rql2ShortType v -> ShortParseXmlNodeGen.create(); - case Rql2IntType v -> IntParseXmlNodeGen.create(); - case Rql2LongType v -> LongParseXmlNodeGen.create(); - case Rql2FloatType v -> FloatParseXmlNodeGen.create(); - case Rql2DoubleType v -> DoubleParseXmlNodeGen.create(); - case Rql2DecimalType v -> DecimalParseXmlNodeGen.create(); - case Rql2StringType v -> StringParseXmlNodeGen.create(); - case Rql2BoolType v -> BoolParseXmlNodeGen.create(); - case Rql2DateType v -> DateParseXmlNodeGen.create(); - case Rql2TimeType v -> TimeParseXmlNodeGen.create(); - case Rql2TimestampType v -> TimestampParseXmlNodeGen.create(); + case SnapiUndefinedType v -> UndefinedParseXmlNodeGen.create(); + case SnapiByteType v -> ByteParseXmlNodeGen.create(); + case SnapiShortType v -> ShortParseXmlNodeGen.create(); + case SnapiIntType v -> IntParseXmlNodeGen.create(); + case SnapiLongType v -> LongParseXmlNodeGen.create(); + case SnapiFloatType v -> FloatParseXmlNodeGen.create(); + case SnapiDoubleType v -> DoubleParseXmlNodeGen.create(); + case SnapiDecimalType v -> DecimalParseXmlNodeGen.create(); + case SnapiStringType v -> StringParseXmlNodeGen.create(); + case SnapiBoolType v -> BoolParseXmlNodeGen.create(); + case SnapiDateType v -> DateParseXmlNodeGen.create(); + case SnapiTimeType v -> TimeParseXmlNodeGen.create(); + case SnapiTimestampType v -> TimestampParseXmlNodeGen.create(); default -> throw new TruffleInternalErrorException(); }; } - public static ProgramExpressionNode recurseXmlParser(Rql2TypeWithProperties tipe, Rql2Language lang) { + public static ProgramExpressionNode recurseXmlParser(SnapiTypeWithProperties tipe, SnapiLanguage lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramExpressionNode(lang, frameDescriptor, recurse(lang, frameDescriptor, tipe, "*")); } - private static ExpressionNode recurse(Rql2Language lang, FrameDescriptor frameDescriptor, Rql2TypeWithProperties tipe, String fieldName) { + private static ExpressionNode recurse(SnapiLanguage lang, FrameDescriptor frameDescriptor, SnapiTypeWithProperties tipe, String fieldName) { boolean isAttribute = fieldName.startsWith("@"); boolean isText = fieldName.equals("#text"); ExpressionNode parserNode; if (isTryable(tipe)) { // tryable goes first. That way it can catch errors hit when parsing compound XML elements, but also // XML attributes or XML "text" content. - Rql2TypeWithProperties innerType = (Rql2TypeWithProperties) tipe.cloneAndRemoveProp(new Rql2IsTryableTypeProperty()); + SnapiTypeWithProperties innerType = (SnapiTypeWithProperties) tipe.cloneAndRemoveProp(new SnapiIsTryableTypeProperty()); ExpressionNode source = recurse(lang, frameDescriptor, innerType, fieldName); ProgramExpressionNode childRootNode = new ProgramExpressionNode(lang, frameDescriptor, source); // errors are recovered differently for attributes parserNode = isAttribute ? new TryableParseAttributeXmlNode(childRootNode) : new TryableParseXmlNode(childRootNode); } else if (isNullable(tipe)) { - Rql2TypeWithProperties innerType = (Rql2TypeWithProperties) tipe.cloneAndRemoveProp(new Rql2IsNullableTypeProperty()); - if (innerType instanceof Rql2PrimitiveType || innerType instanceof Rql2UndefinedType) { + SnapiTypeWithProperties innerType = (SnapiTypeWithProperties) tipe.cloneAndRemoveProp(new SnapiIsNullableTypeProperty()); + if (innerType instanceof SnapiPrimitiveType || innerType instanceof SnapiUndefinedType) { // nullable primitive. We use the "nullable parser" which checks if the element is empty, and if not applies // the primitive parser. The case of 'undefined' is handled as a primitive parser because the nullable checks // the empty string, and calls the undefined parser (which throws) if not. @@ -83,26 +83,26 @@ private static ExpressionNode recurse(Rql2Language lang, FrameDescriptor frameDe } } else { parserNode = switch (tipe) { - case Rql2OrType orType -> { + case SnapiOrType orType -> { Stream children = JavaConverters.seqAsJavaList(orType.tipes()).stream().map(innerType -> { - ExpressionNode child = recurse(lang, frameDescriptor, (Rql2TypeWithProperties) innerType, fieldName); + ExpressionNode child = recurse(lang, frameDescriptor, (SnapiTypeWithProperties) innerType, fieldName); return new ProgramExpressionNode(lang, frameDescriptor, child); }); yield new OrTypeParseXml(children.toArray(ProgramExpressionNode[]::new)); } - case Rql2ListType listType -> + case SnapiListType listType -> // lists are parsed with their item parser, and then wrapped in a list - recurse(lang, frameDescriptor, (Rql2TypeWithProperties) listType.innerType(), fieldName); - case Rql2IterableType iterableType -> + recurse(lang, frameDescriptor, (SnapiTypeWithProperties) listType.innerType(), fieldName); + case SnapiIterableType iterableType -> // iterables are parsed with their item parser, and then wrapped in a list - recurse(lang, frameDescriptor, (Rql2TypeWithProperties) iterableType.innerType(), fieldName); - case Rql2RecordType recordType -> { + recurse(lang, frameDescriptor, (SnapiTypeWithProperties) iterableType.innerType(), fieldName); + case SnapiRecordType recordType -> { Stream children = JavaConverters.seqAsJavaList(recordType.atts()).stream().map(att -> { - ExpressionNode child = recurse(lang, frameDescriptor, (Rql2TypeWithProperties) att.tipe(), att.idn()); + ExpressionNode child = recurse(lang, frameDescriptor, (SnapiTypeWithProperties) att.tipe(), att.idn()); return new ProgramExpressionNode(lang, frameDescriptor, child); }); - String[] idns = JavaConverters.seqAsJavaList(recordType.atts()).stream().map(Rql2AttrType::idn).toArray(String[]::new); - Rql2TypeWithProperties[] tipes = JavaConverters.seqAsJavaList(recordType.atts()).stream().map(a -> (Rql2TypeWithProperties) a.tipe()).toArray(Rql2TypeWithProperties[]::new); + String[] idns = JavaConverters.seqAsJavaList(recordType.atts()).stream().map(SnapiAttrType::idn).toArray(String[]::new); + SnapiTypeWithProperties[] tipes = JavaConverters.seqAsJavaList(recordType.atts()).stream().map(a -> (SnapiTypeWithProperties) a.tipe()).toArray(SnapiTypeWithProperties[]::new); yield new RecordParseXmlNode( children.toArray(ProgramExpressionNode[]::new), idns, @@ -121,12 +121,12 @@ yield new RecordParseXmlNode( return parserNode; } - public static boolean isTryable(Rql2TypeWithProperties tipe) { - return tipe.props().contains(new Rql2IsTryableTypeProperty()); + public static boolean isTryable(SnapiTypeWithProperties tipe) { + return tipe.props().contains(new SnapiIsTryableTypeProperty()); } - private static boolean isNullable(Rql2TypeWithProperties tipe) { - return tipe.props().contains(new Rql2IsNullableTypeProperty()); + private static boolean isNullable(SnapiTypeWithProperties tipe) { + return tipe.props().contains(new SnapiIsNullableTypeProperty()); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java index e486c8452..0661e52b2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CompilerScalaConsts.java @@ -12,10 +12,10 @@ package com.rawlabs.snapi.truffle.emitter.writers; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsNullableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsTryableTypeProperty; public class CompilerScalaConsts { - public static final Rql2IsTryableTypeProperty tryable = Rql2IsTryableTypeProperty.apply(); - public static final Rql2IsNullableTypeProperty nullable = Rql2IsNullableTypeProperty.apply(); + public static final SnapiIsTryableTypeProperty tryable = SnapiIsTryableTypeProperty.apply(); + public static final SnapiIsNullableTypeProperty nullable = SnapiIsNullableTypeProperty.apply(); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java index ddef2453b..d9b21aaf7 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/CsvWriter.java @@ -15,8 +15,8 @@ import com.oracle.truffle.api.frame.FrameDescriptor; import java.util.Arrays; import com.rawlabs.snapi.frontend.base.source.Type; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.StatementNode; import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; import com.rawlabs.snapi.truffle.ast.io.csv.writer.internal.*; @@ -24,7 +24,7 @@ public class CsvWriter { - public static ProgramStatementNode getCsvWriter(Type[] args, Rql2Language lang) { + public static ProgramStatementNode getCsvWriter(Type[] args, SnapiLanguage lang) { ProgramStatementNode[] columnWriters = Arrays.stream(args) .map(arg -> columnWriter(arg, lang)) @@ -34,32 +34,32 @@ public static ProgramStatementNode getCsvWriter(Type[] args, Rql2Language lang) return new ProgramStatementNode(lang, new FrameDescriptor(), recordWriter); } - private static StatementNode columnWriter(Type t, Rql2Language lang) { + private static StatementNode columnWriter(Type t, SnapiLanguage lang) { return switch (t){ - case Rql2TypeWithProperties r when r.props().contains(CompilerScalaConsts.tryable) -> { + case SnapiTypeWithProperties r when r.props().contains(CompilerScalaConsts.tryable) -> { StatementNode inner = columnWriter(r.cloneAndRemoveProp(CompilerScalaConsts.tryable), lang); yield new TryableWriteCsvNode(program(inner, lang)); } - case Rql2TypeWithProperties r when r.props().contains(CompilerScalaConsts.nullable) -> { + case SnapiTypeWithProperties r when r.props().contains(CompilerScalaConsts.nullable) -> { StatementNode inner = columnWriter(r.cloneAndRemoveProp(CompilerScalaConsts.nullable), lang); yield new NullableWriteCsvNode(program(inner, lang)); } - case Rql2TypeWithProperties r -> { + case SnapiTypeWithProperties r -> { assert r.props().isEmpty(); yield switch (r){ - case Rql2ByteType ignored -> new ByteWriteCsvNode(); - case Rql2ShortType ignored -> new ShortWriteCsvNode(); - case Rql2IntType ignored -> new IntWriteCsvNode(); - case Rql2LongType ignored -> new LongWriteCsvNode(); - case Rql2FloatType ignored -> new FloatWriteCsvNode(); - case Rql2DoubleType ignored -> new DoubleWriteCsvNode(); - case Rql2DecimalType ignored -> new DecimalWriteCsvNode(); - case Rql2BoolType ignored -> new BoolWriteCsvNode(); - case Rql2StringType ignored -> new StringWriteCsvNode(); - case Rql2DateType ignored -> new DateWriteCsvNode(); - case Rql2TimeType ignored -> new TimeWriteCsvNode(); - case Rql2TimestampType ignored -> new TimestampWriteCsvNode(); - case Rql2BinaryType ignored -> new BinaryWriteCsvNode(); + case SnapiByteType ignored -> new ByteWriteCsvNode(); + case SnapiShortType ignored -> new ShortWriteCsvNode(); + case SnapiIntType ignored -> new IntWriteCsvNode(); + case SnapiLongType ignored -> new LongWriteCsvNode(); + case SnapiFloatType ignored -> new FloatWriteCsvNode(); + case SnapiDoubleType ignored -> new DoubleWriteCsvNode(); + case SnapiDecimalType ignored -> new DecimalWriteCsvNode(); + case SnapiBoolType ignored -> new BoolWriteCsvNode(); + case SnapiStringType ignored -> new StringWriteCsvNode(); + case SnapiDateType ignored -> new DateWriteCsvNode(); + case SnapiTimeType ignored -> new TimeWriteCsvNode(); + case SnapiTimestampType ignored -> new TimestampWriteCsvNode(); + case SnapiBinaryType ignored -> new BinaryWriteCsvNode(); default -> throw new TruffleInternalErrorException(); }; } @@ -67,7 +67,7 @@ yield switch (r){ }; } - private static ProgramStatementNode program(StatementNode e, Rql2Language lang) { + private static ProgramStatementNode program(StatementNode e, SnapiLanguage lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramStatementNode(lang, frameDescriptor, e); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java index bff9e26b8..0cda8a18a 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/JsonWriter.java @@ -13,8 +13,8 @@ package com.rawlabs.snapi.truffle.emitter.writers; import com.oracle.truffle.api.frame.FrameDescriptor; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.StatementNode; import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; import com.rawlabs.snapi.truffle.ast.io.json.writer.internal.*; @@ -26,65 +26,65 @@ public class JsonWriter { - public static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, Rql2Language lang) { + public static ProgramStatementNode recurse(SnapiTypeWithProperties tipe, SnapiLanguage lang) { return recurse(tipe, false, lang); } - private static ProgramStatementNode recurse(Rql2TypeWithProperties tipe, boolean isSafe, Rql2Language lang) { + private static ProgramStatementNode recurse(SnapiTypeWithProperties tipe, boolean isSafe, SnapiLanguage lang) { return program(switch (tipe){ - case Rql2TypeWithProperties nt when nt.props().contains(tryable) -> { - Rql2TypeWithProperties nextType = (Rql2TypeWithProperties) nt.cloneAndRemoveProp(tryable); + case SnapiTypeWithProperties nt when nt.props().contains(tryable) -> { + SnapiTypeWithProperties nextType = (SnapiTypeWithProperties) nt.cloneAndRemoveProp(tryable); ProgramStatementNode child = recurse(nextType, lang); if (isSafe) yield new TryableWriteJsonNode(child); else yield new TryableUnsafeWriteJsonNode(child); } - case Rql2TypeWithProperties nt when nt.props().contains(nullable) -> { - Rql2TypeWithProperties nextType = (Rql2TypeWithProperties) nt.cloneAndRemoveProp(nullable); + case SnapiTypeWithProperties nt when nt.props().contains(nullable) -> { + SnapiTypeWithProperties nextType = (SnapiTypeWithProperties) nt.cloneAndRemoveProp(nullable); ProgramStatementNode child = recurse(nextType, lang); yield new NullableWriteJsonNode(child); } - case Rql2ListType r ->{ - ProgramStatementNode child = recurse((Rql2TypeWithProperties)r.innerType(), true, lang); + case SnapiListType r ->{ + ProgramStatementNode child = recurse((SnapiTypeWithProperties)r.innerType(), true, lang); yield new ListWriteJsonNode(child); } - case Rql2IterableType r ->{ - ProgramStatementNode child = recurse((Rql2TypeWithProperties)r.innerType(), true, lang); + case SnapiIterableType r ->{ + ProgramStatementNode child = recurse((SnapiTypeWithProperties)r.innerType(), true, lang); yield new IterableWriteJsonNode(child); } - case Rql2RecordType r ->{ + case SnapiRecordType r ->{ ProgramStatementNode[] children = JavaConverters.asJavaCollection(r.atts()) - .stream().map(a -> (Rql2AttrType) a) - .map(att -> recurse((Rql2TypeWithProperties) att.tipe(), true, lang)) + .stream().map(a -> (SnapiAttrType) a) + .map(att -> recurse((SnapiTypeWithProperties) att.tipe(), true, lang)) .toArray(ProgramStatementNode[]::new); yield new RecordWriteJsonNode(children); } - case Rql2ByteType ignored -> new ByteWriteJsonNode(); - case Rql2ShortType ignored -> new ShortWriteJsonNode(); - case Rql2IntType ignored -> new IntWriteJsonNode(); - case Rql2LongType ignored -> new LongWriteJsonNode(); - case Rql2FloatType ignored -> new FloatWriteJsonNode(); - case Rql2DoubleType ignored -> new DoubleWriteJsonNode(); - case Rql2DecimalType ignored -> new DecimalWriteJsonNode(); - case Rql2BoolType ignored -> new BooleanWriteJsonNode(); - case Rql2StringType ignored -> new StringWriteJsonNode(); - case Rql2DateType ignored -> new DateWriteJsonNode(); - case Rql2TimeType ignored -> new TimeWriteJsonNode(); - case Rql2TimestampType ignored -> new TimestampWriteJsonNode(); - case Rql2IntervalType ignored ->new IntervalWriteJsonNode(); - case Rql2BinaryType ignored -> new BinaryWriteJsonNode(); - case Rql2OrType or -> { + case SnapiByteType ignored -> new ByteWriteJsonNode(); + case SnapiShortType ignored -> new ShortWriteJsonNode(); + case SnapiIntType ignored -> new IntWriteJsonNode(); + case SnapiLongType ignored -> new LongWriteJsonNode(); + case SnapiFloatType ignored -> new FloatWriteJsonNode(); + case SnapiDoubleType ignored -> new DoubleWriteJsonNode(); + case SnapiDecimalType ignored -> new DecimalWriteJsonNode(); + case SnapiBoolType ignored -> new BooleanWriteJsonNode(); + case SnapiStringType ignored -> new StringWriteJsonNode(); + case SnapiDateType ignored -> new DateWriteJsonNode(); + case SnapiTimeType ignored -> new TimeWriteJsonNode(); + case SnapiTimestampType ignored -> new TimestampWriteJsonNode(); + case SnapiIntervalType ignored ->new IntervalWriteJsonNode(); + case SnapiBinaryType ignored -> new BinaryWriteJsonNode(); + case SnapiOrType or -> { ProgramStatementNode[] children = JavaConverters.asJavaCollection(or.tipes()) .stream() - .map(t -> recurse((Rql2TypeWithProperties) t, true,lang)) + .map(t -> recurse((SnapiTypeWithProperties) t, true,lang)) .toArray(ProgramStatementNode[]::new); yield new OrWriteJsonNode(children); } - case Rql2UndefinedType ignored -> new UndefinedWriteJsonNode(); + case SnapiUndefinedType ignored -> new UndefinedWriteJsonNode(); default -> throw new TruffleInternalErrorException(); }, lang); } - private static ProgramStatementNode program(StatementNode e, Rql2Language lang) { + private static ProgramStatementNode program(StatementNode e, SnapiLanguage lang) { FrameDescriptor frameDescriptor = new FrameDescriptor(); return new ProgramStatementNode(lang, frameDescriptor, e); } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java index 8d9698926..0a7c9bc80 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/emitter/writers/TruffleBinaryWriter.java @@ -13,11 +13,11 @@ package com.rawlabs.snapi.truffle.emitter.writers; import com.oracle.truffle.api.frame.FrameDescriptor; -import com.rawlabs.snapi.frontend.rql2.source.Rql2BinaryType; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsNullableTypeProperty; -import com.rawlabs.snapi.frontend.rql2.source.Rql2IsTryableTypeProperty; -import com.rawlabs.snapi.frontend.rql2.source.Rql2StringType; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.SnapiBinaryType; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsNullableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiIsTryableTypeProperty; +import com.rawlabs.snapi.frontend.snapi.source.SnapiStringType; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.ProgramStatementNode; import com.rawlabs.snapi.truffle.ast.io.binary.BinaryBytesWriterNode; import com.rawlabs.snapi.truffle.ast.io.binary.NullableBinaryWriterNode; @@ -26,19 +26,19 @@ public class TruffleBinaryWriter { public static ProgramStatementNode getBinaryWriterNode( - Rql2BinaryType type, Rql2Language lang, FrameDescriptor frameDescriptor) { + SnapiBinaryType type, SnapiLanguage lang, FrameDescriptor frameDescriptor) { if (type.props().isEmpty()) { return new ProgramStatementNode(lang, frameDescriptor, new BinaryBytesWriterNode()); - } else if (type.props().contains(Rql2IsTryableTypeProperty.apply())) { - Rql2BinaryType innerType = - (Rql2BinaryType) type.cloneAndRemoveProp(Rql2IsTryableTypeProperty.apply()); + } else if (type.props().contains(SnapiIsTryableTypeProperty.apply())) { + SnapiBinaryType innerType = + (SnapiBinaryType) type.cloneAndRemoveProp(SnapiIsTryableTypeProperty.apply()); ProgramStatementNode innerWriter = TruffleBinaryWriter.getBinaryWriterNode(innerType, lang, frameDescriptor); return new ProgramStatementNode( lang, frameDescriptor, new TryableBinaryWriterNode(innerWriter)); } else { - Rql2BinaryType innerType = - (Rql2BinaryType) type.cloneAndRemoveProp(Rql2IsNullableTypeProperty.apply()); + SnapiBinaryType innerType = + (SnapiBinaryType) type.cloneAndRemoveProp(SnapiIsNullableTypeProperty.apply()); ProgramStatementNode innerWriter = TruffleBinaryWriter.getBinaryWriterNode(innerType, lang, frameDescriptor); return new ProgramStatementNode( @@ -47,19 +47,19 @@ public static ProgramStatementNode getBinaryWriterNode( } public static ProgramStatementNode getBinaryWriterNode( - Rql2StringType type, Rql2Language lang, FrameDescriptor frameDescriptor) { + SnapiStringType type, SnapiLanguage lang, FrameDescriptor frameDescriptor) { if (type.props().isEmpty()) { return new ProgramStatementNode(lang, frameDescriptor, new BinaryBytesWriterNode()); - } else if (type.props().contains(Rql2IsTryableTypeProperty.apply())) { - Rql2StringType innerType = - (Rql2StringType) type.cloneAndRemoveProp(Rql2IsTryableTypeProperty.apply()); + } else if (type.props().contains(SnapiIsTryableTypeProperty.apply())) { + SnapiStringType innerType = + (SnapiStringType) type.cloneAndRemoveProp(SnapiIsTryableTypeProperty.apply()); ProgramStatementNode innerWriter = TruffleBinaryWriter.getBinaryWriterNode(innerType, lang, frameDescriptor); return new ProgramStatementNode( lang, frameDescriptor, new TryableBinaryWriterNode(innerWriter)); } else { - Rql2StringType innerType = - (Rql2StringType) type.cloneAndRemoveProp(Rql2IsNullableTypeProperty.apply()); + SnapiStringType innerType = + (SnapiStringType) type.cloneAndRemoveProp(SnapiIsNullableTypeProperty.apply()); ProgramStatementNode innerWriter = TruffleBinaryWriter.getBinaryWriterNode(innerType, lang, frameDescriptor); return new ProgramStatementNode( diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java index 41392a1d1..d39d55baa 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/function/FunctionRegistryObject.java @@ -18,7 +18,7 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.runtime.list.StringList; import java.util.HashMap; import java.util.Map; @@ -65,7 +65,7 @@ final boolean hasLanguage() { @ExportMessage final Class> getLanguage() { - return Rql2Language.class; + return SnapiLanguage.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java index 8a30d6911..b0895ed3c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/StaticInitializers.java @@ -15,7 +15,7 @@ import com.esotericsoftware.kryo.io.Output; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.Rql2Context; +import com.rawlabs.snapi.truffle.SnapiContext; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct.OffHeapDistinct; import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by.OffHeapGroupByKey; @@ -37,7 +37,7 @@ public static void kryoWriteInt(Output kryoOutput, int size) { @CompilerDirectives.TruffleBoundary public static FileOutputStream getGroupByKeyNewDiskBuffer( OffHeapGroupByKey offHeapGroupByKey, Node node) { - RawSettings settings = Rql2Context.get(node).getSettings(); + RawSettings settings = SnapiContext.get(node).getSettings(); File file; file = IOUtils.getScratchFile("groupby.", ".kryo", settings).toFile(); offHeapGroupByKey.getSpilledBuffers().add(file); @@ -52,7 +52,7 @@ public static FileOutputStream getGroupByKeyNewDiskBuffer( public static FileOutputStream groupByKeysNextFile( OffHeapGroupByKeys offHeapGroupByKeys, Node node) { File file; - RawSettings settings = Rql2Context.get(node).getSettings(); + RawSettings settings = SnapiContext.get(node).getSettings(); file = IOUtils.getScratchFile("orderby.", ".kryo", settings).toFile(); offHeapGroupByKeys.getSpilledBuffers().add(file); try { @@ -65,7 +65,7 @@ public static FileOutputStream groupByKeysNextFile( @CompilerDirectives.TruffleBoundary public static FileOutputStream distinctNextFile(OffHeapDistinct offHeapDistinct, Node node) { File file; - RawSettings settings = Rql2Context.get(node).getSettings(); + RawSettings settings = SnapiContext.get(node).getSettings(); file = IOUtils.getScratchFile("distinct.", ".kryo", settings).toFile(); offHeapDistinct.getSpilledBuffers().add(file); try { @@ -82,12 +82,12 @@ public static void kryoOutputClose(Output kryoOutput) { public static int getKryoOutputBufferSize(Node node) { return (int) - Rql2Context.get(node).getSettings().getMemorySize("raw.runtime.kryo.output-buffer-size"); + SnapiContext.get(node).getSettings().getMemorySize("raw.runtime.kryo.output-buffer-size"); } @CompilerDirectives.TruffleBoundary public static long[] getContextValues(Node node) { - RawSettings rawSettings = Rql2Context.get(node).getSettings(); + RawSettings rawSettings = SnapiContext.get(node).getSettings(); long[] contextValues = new long[3]; contextValues[0] = rawSettings.getMemorySize("raw.runtime.external.disk-block-max-size"); contextValues[1] = getKryoOutputBufferSize(node); @@ -97,21 +97,21 @@ public static long[] getContextValues(Node node) { @CompilerDirectives.TruffleBoundary public static RawSettings getRawSettings(Node node) { - return Rql2Context.get(node).getSettings(); + return SnapiContext.get(node).getSettings(); } @CompilerDirectives.TruffleBoundary - public static Rql2Context getRql2Context(Node node) { - return Rql2Context.get(node); + public static SnapiContext getSnapiContext(Node node) { + return SnapiContext.get(node); } @CompilerDirectives.TruffleBoundary public static OutputStream getOutputStream(Node node) { - return Rql2Context.get(node).getOutput(); + return SnapiContext.get(node).getOutput(); } @CompilerDirectives.TruffleBoundary public static String[] getScopes(Node node) { - return Rql2Context.get(node).getScopes(); + return SnapiContext.get(node).getScopes(); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java index 737f58188..c7303bac4 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/ComputeNextNodes.java @@ -24,8 +24,8 @@ import com.oracle.truffle.api.nodes.LoopNode; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Context; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiContext; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.io.csv.reader.CsvParserNodes; import com.rawlabs.snapi.truffle.ast.io.json.reader.JsonParserNodes; import com.rawlabs.snapi.truffle.ast.io.xml.parser.TruffleXmlParser; @@ -357,8 +357,8 @@ static Object next( return next; } - public static Rql2Language getRql2Language(Node node) { - return Rql2Language.get(node); + public static SnapiLanguage getSnapiLanguage(Node node) { + return SnapiLanguage.get(node); } @Specialization @@ -366,7 +366,7 @@ static Object next( Node node, ZipComputeNext computeNext, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, + @Cached(value = "getSnapiLanguage(thisNode)", allowUncached = true) SnapiLanguage language, @Cached @Cached.Exclusive GeneratorNodes.GeneratorHasNextNode hasNextNode1, @Cached @Cached.Exclusive GeneratorNodes.GeneratorHasNextNode hasNextNode2, @Cached(inline = false) @Cached.Exclusive GeneratorNodes.GeneratorNextNode nextNode1, @@ -803,7 +803,7 @@ static void init( @Cached(inline = false) @Cached.Shared("init") GeneratorNodes.GeneratorInitNode initNode, @Cached @Cached.Shared("close1") GeneratorNodes.GeneratorCloseNode closeNode) { - RawSettings settings = Rql2Context.get(thisNode).getSettings(); + RawSettings settings = SnapiContext.get(thisNode).getSettings(); computeNext.setDiskRight(IOUtils.getScratchFile("cartesian.", ".kryo", settings).toFile()); // save right to disk diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java index a19cf4f8e..bb5ab4260 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/EquiJoinComputeNext.java @@ -13,13 +13,13 @@ package com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations; import com.oracle.truffle.api.frame.MaterializedFrame; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; public class EquiJoinComputeNext { private final Object leftIterable, rightIterable; private final Object leftKeyF, rightKeyF, mkJoinedRecord; - private final Rql2TypeWithProperties leftRowType, rightRowType, keyType; + private final SnapiTypeWithProperties leftRowType, rightRowType, keyType; private Object leftMapGenerator = null, rightMapGenerator = null; // generators from group-by key maps private Object[] leftEntry = null, rightEntry = null; @@ -36,11 +36,11 @@ public class EquiJoinComputeNext { public EquiJoinComputeNext( Object leftIterable, Object leftKeyF, - Rql2TypeWithProperties leftRowType, + SnapiTypeWithProperties leftRowType, Object rightIterable, Object rightKeyF, - Rql2TypeWithProperties rightRowType, - Rql2TypeWithProperties keyType, + SnapiTypeWithProperties rightRowType, + SnapiTypeWithProperties keyType, Object mkJoinedRecord, MaterializedFrame frame, int computeNextSlot, @@ -84,15 +84,15 @@ public Object getMkJoinedRecord() { return mkJoinedRecord; } - public Rql2TypeWithProperties getLeftRowType() { + public SnapiTypeWithProperties getLeftRowType() { return leftRowType; } - public Rql2TypeWithProperties getRightRowType() { + public SnapiTypeWithProperties getRightRowType() { return rightRowType; } - public Rql2TypeWithProperties getKeyType() { + public SnapiTypeWithProperties getKeyType() { return keyType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java index 4c8c9dc10..7c6d8fa0f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/abstract_generator/compute_next/operations/JoinComputeNext.java @@ -15,7 +15,7 @@ import com.esotericsoftware.kryo.io.Input; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.MaterializedFrame; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import java.io.File; public class JoinComputeNext { @@ -29,7 +29,7 @@ public class JoinComputeNext { private Object leftRow = null; private Object rightRow = null; Input kryoRight = null; - private final Rql2TypeWithProperties rightRowType; // grouped key and value types. + private final SnapiTypeWithProperties rightRowType; // grouped key and value types. private int spilledRight = 0; private int readRight = 0; private final Boolean reshapeBeforePredicate; @@ -46,7 +46,7 @@ public JoinComputeNext( Object remap, Object predicate, Boolean reshapeBeforePredicate, - Rql2TypeWithProperties rightRowType, + SnapiTypeWithProperties rightRowType, int kryoOutputBufferSize, MaterializedFrame frame, int computeNextSlot, @@ -121,7 +121,7 @@ public int getKryoOutputBufferSize() { return kryoOutputBufferSize; } - public Rql2TypeWithProperties getRightRowType() { + public SnapiTypeWithProperties getRightRowType() { return rightRowType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java index 0ae00517b..484a379f8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/input_buffer/InputBufferNodes.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.kryo.KryoNodes; public class InputBufferNodes { @@ -51,7 +51,7 @@ static Object[] headKey( @Cached @Cached.Exclusive KryoNodes.KryoReadNode kryoRead) { // read the next key (if it is null, otherwise keep the current one). if (buffer.getKeys() == null) { - Rql2TypeWithProperties[] keyTypes = buffer.getOffHeapGroupByKey().getKeyTypes(); + SnapiTypeWithProperties[] keyTypes = buffer.getOffHeapGroupByKey().getKeyTypes(); Object[] keys = new Object[keyTypes.length]; for (int i = 0; i < keyTypes.length; i++) { keys[i] = kryoRead.execute(thisNode, buffer.getInput(), keyTypes[i]); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java index e5f4842ab..de41b4e89 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/distinct/OffHeapDistinct.java @@ -13,7 +13,7 @@ package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.distinct; import com.oracle.truffle.api.frame.MaterializedFrame; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapObject; import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; @@ -30,7 +30,7 @@ public class OffHeapDistinct { // spill // to disk). - private final Rql2TypeWithProperties itemType; // grouped key and value types. + private final SnapiTypeWithProperties itemType; // grouped key and value types. private final int itemSize; // grouped key and value kryo binary size private final int kryoOutputBufferSize, kryoInputBufferSize; // size of the kryo buffers used to write and read the data. @@ -38,7 +38,7 @@ public class OffHeapDistinct { private final MaterializedFrame frame; public OffHeapDistinct( - Rql2TypeWithProperties vType, + SnapiTypeWithProperties vType, MaterializedFrame frame, long blockSize, int kryoOutputBufferSize, @@ -73,7 +73,7 @@ public int getBinarySize() { return binarySize; } - public Rql2TypeWithProperties getItemType() { + public SnapiTypeWithProperties getItemType() { return itemType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java index bdfb944ad..bbfc86059 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/group_by/OffHeapGroupByKey.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.group_by; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapObject; import com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.record_shaper.RecordShaper; import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; @@ -29,7 +29,7 @@ public class OffHeapGroupByKey { size; // estimated size of currently memory held objects (when reaching blockSize, spill // to // disk). - private final Rql2TypeWithProperties keyType, rowType; // grouping key and row types. + private final SnapiTypeWithProperties keyType, rowType; // grouping key and row types. private final int kryoOutputBufferSize, kryoInputBufferSize; // size of the kryo buffers used to write and read the data. private final int keySize, rowSize; // grouping key and row kryo estimated binary size @@ -37,8 +37,8 @@ public class OffHeapGroupByKey { private final RecordShaper reshape; public OffHeapGroupByKey( - Rql2TypeWithProperties kType, - Rql2TypeWithProperties rowType, + SnapiTypeWithProperties kType, + SnapiTypeWithProperties rowType, RecordShaper reshape, long maxSize, int kryoOutputBufferSize, @@ -75,11 +75,11 @@ public int getSize() { return size; } - public Rql2TypeWithProperties getKeyType() { + public SnapiTypeWithProperties getKeyType() { return keyType; } - public Rql2TypeWithProperties getRowType() { + public SnapiTypeWithProperties getRowType() { return rowType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java index 7b3cf116d..038811f55 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/off_heap/order_by/OffHeapGroupByKeys.java @@ -12,7 +12,7 @@ package com.rawlabs.snapi.truffle.runtime.generator.collection.off_heap_generator.off_heap.order_by; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.data_structures.treemap.TreeMapObject; import com.rawlabs.snapi.truffle.runtime.utils.KryoFootPrint; import java.io.File; @@ -29,23 +29,23 @@ public class OffHeapGroupByKeys { // to // disk). - private final Rql2TypeWithProperties[] keyTypes; // grouped key and value types. - private final Rql2TypeWithProperties rowType; // grouped key and value types. + private final SnapiTypeWithProperties[] keyTypes; // grouped key and value types. + private final SnapiTypeWithProperties rowType; // grouped key and value types. private final int keysSize, rowSize; // grouping keys and row kryo binary size private final int kryoOutputBufferSize, kryoInputBufferSize; // size of the kryo buffers used to write and read the data. - private static int keysFootPrint(Rql2TypeWithProperties[] keyType) { + private static int keysFootPrint(SnapiTypeWithProperties[] keyType) { int size = 0; - for (Rql2TypeWithProperties t : keyType) { + for (SnapiTypeWithProperties t : keyType) { size += KryoFootPrint.of(t); } return size; } public OffHeapGroupByKeys( - Rql2TypeWithProperties[] kTypes, - Rql2TypeWithProperties rowType, + SnapiTypeWithProperties[] kTypes, + SnapiTypeWithProperties rowType, int[] keyOrderings, long maxSize, int kryoOutputBufferSize, @@ -80,11 +80,11 @@ public int getSize() { return size; } - public Rql2TypeWithProperties[] getKeyTypes() { + public SnapiTypeWithProperties[] getKeyTypes() { return keyTypes; } - public Rql2TypeWithProperties getRowType() { + public SnapiTypeWithProperties getRowType() { return rowType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java index 169c8895c..01583be80 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/generator/collection/off_heap_generator/record_shaper/RecordShaperNodes.java @@ -15,7 +15,7 @@ import com.oracle.truffle.api.dsl.*; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.runtime.list.ObjectList; import com.rawlabs.snapi.truffle.runtime.record.RecordNodes; @@ -27,8 +27,8 @@ public abstract static class MakeRowNode extends Node { public abstract Object execute(Node node, Object shaper, Object key, Object[] values); - public static Rql2Language getRql2Language(Node node) { - return Rql2Language.get(node); + public static SnapiLanguage getSnapiLanguage(Node node) { + return SnapiLanguage.get(node); } @Specialization(guards = {"shaper != null", "!shaper.forList()"}) @@ -38,7 +38,7 @@ static Object makeRowCollection( Object key, Object[] values, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, + @Cached(value = "getSnapiLanguage(thisNode)", allowUncached = true) SnapiLanguage language, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode1, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode2) { Object record = language.createPureRecord(); @@ -55,7 +55,7 @@ static Object makeRowList( Object key, Object[] values, @Bind("$node") Node thisNode, - @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, + @Cached(value = "getSnapiLanguage(thisNode)", allowUncached = true) SnapiLanguage language, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode1, @Cached @Cached.Exclusive RecordNodes.AddPropNode addPropNode2) { Object record = language.createPureRecord(); diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java index 8a9c3e820..931b7070c 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/DistinctCollection.java @@ -20,21 +20,21 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @ExportLibrary(InteropLibrary.class) public class DistinctCollection implements TruffleObject { final Object iterable; - final Rql2TypeWithProperties rowType; + final SnapiTypeWithProperties rowType; private final MaterializedFrame frame; private final int generatorSlot; private final int offHeapDistinctSlot; public DistinctCollection( Object iterable, - Rql2TypeWithProperties vType, + SnapiTypeWithProperties vType, MaterializedFrame frame, int generatorSlot, int offHeapDistinctSlot) { @@ -49,7 +49,7 @@ public Object getIterable() { return iterable; } - public Rql2TypeWithProperties getRowType() { + public SnapiTypeWithProperties getRowType() { return rowType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java index 5d78e80ce..e8e225bab 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/EquiJoinCollection.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.EquiJoinComputeNext; @@ -30,8 +30,8 @@ public class EquiJoinCollection implements TruffleObject { final Object leftIterable, rightIterable; final Object leftKeyF, rightKeyF, reshapeFun; - final Rql2TypeWithProperties leftRowType, rightRowType; - final Rql2TypeWithProperties keyType; + final SnapiTypeWithProperties leftRowType, rightRowType; + final SnapiTypeWithProperties keyType; private final MaterializedFrame frame; private final int computeNextSlot; private final int shouldContinueSlot; @@ -42,11 +42,11 @@ public class EquiJoinCollection implements TruffleObject { public EquiJoinCollection( Object leftIterable, Object leftKeyF, - Rql2TypeWithProperties leftRowType, + SnapiTypeWithProperties leftRowType, Object rightIterable, Object rightKeyF, - Rql2TypeWithProperties rightRowType, - Rql2TypeWithProperties keyType, + SnapiTypeWithProperties rightRowType, + SnapiTypeWithProperties keyType, Object reshapeFun, MaterializedFrame frame, int computeNextSlot, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java index e72e15f3b..73336b457 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/GroupByCollection.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @@ -28,8 +28,8 @@ public class GroupByCollection implements TruffleObject { final Object iterable; final Object keyFun; - final Rql2TypeWithProperties keyType; - final Rql2TypeWithProperties rowType; + final SnapiTypeWithProperties keyType; + final SnapiTypeWithProperties rowType; private final MaterializedFrame frame; private final int generatorSlot; private final int keyFunctionSlot; @@ -38,8 +38,8 @@ public class GroupByCollection implements TruffleObject { public GroupByCollection( Object iterable, Object keyFun, - Rql2TypeWithProperties kType, - Rql2TypeWithProperties rowType, + SnapiTypeWithProperties kType, + SnapiTypeWithProperties rowType, MaterializedFrame frame, int generatorSlot, int keyFunctionSlot, @@ -62,11 +62,11 @@ public Object getKeyFun() { return keyFun; } - public Rql2TypeWithProperties getKeyType() { + public SnapiTypeWithProperties getKeyType() { return keyType; } - public Rql2TypeWithProperties getRowType() { + public SnapiTypeWithProperties getRowType() { return rowType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java index 09534b3fe..a400b67c2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/JoinCollection.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.AbstractGenerator; import com.rawlabs.snapi.truffle.runtime.generator.collection.abstract_generator.compute_next.operations.JoinComputeNext; @@ -31,7 +31,7 @@ public class JoinCollection implements TruffleObject { final Object leftIterable; final Object rightIterable; final Object predicate, remap; - final Rql2TypeWithProperties rightType; + final SnapiTypeWithProperties rightType; private final Boolean reshapeBeforePredicate; private final int kryoOutputBufferSize; @@ -47,7 +47,7 @@ public JoinCollection( Object rightIterable, Object remap, Object predicate, - Rql2TypeWithProperties rightType, + SnapiTypeWithProperties rightType, Boolean reshapeBeforePredicate, int kryoOutputBufferSize, MaterializedFrame frame, diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java index b8a1f0a62..668158ec8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/OrderByCollection.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.frontend.rql2.source.Rql2TypeWithProperties; +import com.rawlabs.snapi.frontend.snapi.source.SnapiTypeWithProperties; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @@ -29,8 +29,8 @@ public class OrderByCollection implements TruffleObject { final Object parentIterable; final Object[] keyFunctions; final int[] keyOrderings; - final Rql2TypeWithProperties[] keyTypes; - final Rql2TypeWithProperties rowType; + final SnapiTypeWithProperties[] keyTypes; + final SnapiTypeWithProperties rowType; private final MaterializedFrame frame; private final int generatorSlot; private final int collectionSlot; @@ -40,8 +40,8 @@ public OrderByCollection( Object iterable, Object[] keyFunctions, int[] keyOrderings, - Rql2TypeWithProperties[] keyTypes, - Rql2TypeWithProperties rowType, + SnapiTypeWithProperties[] keyTypes, + SnapiTypeWithProperties rowType, MaterializedFrame frame, int generatorSlot, int collectionSlot, @@ -69,11 +69,11 @@ public int[] getKeyOrderings() { return keyOrderings; } - public Rql2TypeWithProperties[] getKeyTypes() { + public SnapiTypeWithProperties[] getKeyTypes() { return keyTypes; } - public Rql2TypeWithProperties getRowType() { + public SnapiTypeWithProperties getRowType() { return rowType; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java index cf416936d..7966bc1e1 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/iterable/operations/ZipCollection.java @@ -19,7 +19,7 @@ import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; import com.oracle.truffle.api.nodes.Node; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; import com.rawlabs.snapi.truffle.runtime.iterable.IterableNodes; @@ -28,7 +28,7 @@ public class ZipCollection implements TruffleObject { final Object parentIterable1; final Object parentIterable2; - public ZipCollection(Object iterable1, Object iterable2, Rql2Language language) { + public ZipCollection(Object iterable1, Object iterable2, SnapiLanguage language) { this.parentIterable1 = iterable1; this.parentIterable2 = iterable2; } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java index 646465c3d..524c66bb8 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/kryo/KryoNodes.java @@ -19,8 +19,8 @@ import com.oracle.truffle.api.nodes.ExplodeLoop; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.nodes.NodeInfo; -import com.rawlabs.snapi.frontend.rql2.source.*; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.frontend.snapi.source.*; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.TypeGuards; import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes; import com.rawlabs.snapi.truffle.runtime.generator.collection.GeneratorNodes; @@ -46,20 +46,20 @@ public class KryoNodes { @ImportStatic(TypeGuards.class) public abstract static class KryoReadNode extends Node { - public abstract Object execute(Node node, Input input, Rql2TypeWithProperties t); + public abstract Object execute(Node node, Input input, SnapiTypeWithProperties t); @Specialization(guards = {"isTryable(t)"}) @CompilerDirectives.TruffleBoundary static Object doTryable( Node node, Input input, - Rql2TypeWithProperties t, + SnapiTypeWithProperties t, @Bind("$node") Node thisNode, @Cached(inline = false) @Cached.Exclusive KryoReadNode kryo) { boolean isSuccess = input.readBoolean(); if (isSuccess) { - Rql2TypeWithProperties successType = - (Rql2TypeWithProperties) t.cloneAndRemoveProp(new Rql2IsTryableTypeProperty()); + SnapiTypeWithProperties successType = + (SnapiTypeWithProperties) t.cloneAndRemoveProp(new SnapiIsTryableTypeProperty()); return kryo.execute(thisNode, input, successType); } else { String error = input.readString(); @@ -72,13 +72,13 @@ static Object doTryable( static Object doNullable( Node node, Input input, - Rql2TypeWithProperties t, + SnapiTypeWithProperties t, @Bind("$node") Node thisNode, @Cached(inline = false) @Cached.Exclusive KryoReadNode kryo) { boolean isDefined = input.readBoolean(); if (isDefined) { - Rql2TypeWithProperties innerType = - (Rql2TypeWithProperties) t.cloneAndRemoveProp(new Rql2IsNullableTypeProperty()); + SnapiTypeWithProperties innerType = + (SnapiTypeWithProperties) t.cloneAndRemoveProp(new SnapiIsNullableTypeProperty()); return kryo.execute(thisNode, input, innerType); } else { return NullObject.INSTANCE; @@ -90,11 +90,11 @@ static Object doNullable( static ObjectList doList( Node node, Input input, - Rql2TypeWithProperties t, + SnapiTypeWithProperties t, @Bind("$node") Node thisNode, @Cached(inline = false) @Cached.Exclusive KryoReadNode kryo) { - Rql2ListType listType = (Rql2ListType) t; - Rql2TypeWithProperties innerType = (Rql2TypeWithProperties) listType.innerType(); + SnapiListType listType = (SnapiListType) t; + SnapiTypeWithProperties innerType = (SnapiTypeWithProperties) listType.innerType(); int size = input.readInt(); Object[] values = new Object[size]; for (int i = 0; i < size; i++) { @@ -108,11 +108,11 @@ static ObjectList doList( static Object doIterable( Node node, Input input, - Rql2TypeWithProperties t, + SnapiTypeWithProperties t, @Bind("$node") Node thisNode, @Cached(inline = false) @Cached.Exclusive KryoReadNode kryo) { - Rql2IterableType iterableType = (Rql2IterableType) t; - Rql2TypeWithProperties innerType = (Rql2TypeWithProperties) iterableType.innerType(); + SnapiIterableType iterableType = (SnapiIterableType) t; + SnapiTypeWithProperties innerType = (SnapiTypeWithProperties) iterableType.innerType(); int size = input.readInt(); Object[] values = new Object[size]; for (int i = 0; i < size; i++) { @@ -137,8 +137,8 @@ public static KryoReadNode[] createKryoRead(int size) { return kryoRead; } - public static boolean hasDuplicateKeys(Rql2RecordType t) { - Vector atts = t.atts(); + public static boolean hasDuplicateKeys(SnapiRecordType t) { + Vector atts = t.atts(); List list = new ArrayList<>(); for (int i = 0; i < atts.size(); i++) { list.add(atts.apply(i).idn()); @@ -146,8 +146,8 @@ public static boolean hasDuplicateKeys(Rql2RecordType t) { return list.size() != list.stream().distinct().count(); } - public static Rql2Language getRql2Language(Node node) { - return Rql2Language.get(node); + public static SnapiLanguage getSnapiLanguage(Node node) { + return SnapiLanguage.get(node); } @Specialization(guards = {"isRecordKind(t)"}) @@ -155,17 +155,17 @@ public static Rql2Language getRql2Language(Node node) { static Object doRecord( Node node, Input input, - Rql2RecordType t, + SnapiRecordType t, @Bind("$node") Node thisNode, @Cached(value = "hasDuplicateKeys(t)", allowUncached = true) boolean hasDuplicateKeys, - @Cached(value = "getRql2Language(thisNode)", allowUncached = true) Rql2Language language, + @Cached(value = "getSnapiLanguage(thisNode)", allowUncached = true) SnapiLanguage language, @Cached(value = "createAddProps(t.atts().size())", allowUncached = true) RecordNodes.AddPropNode[] addPropNode, @Cached(value = "addPropNode.length", allowUncached = true) int size, @Cached(value = "createKryoRead(size)", allowUncached = true) KryoReadNode[] kryo) { Object record = language.createPureRecord(); for (int i = 0; i < size; i++) { - Rql2TypeWithProperties attType = getTipe(t, i); + SnapiTypeWithProperties attType = getTipe(t, i); Object value = kryo[i].execute(thisNode, input, attType); addPropNode[i].execute(thisNode, record, getIdn(t, i), value, hasDuplicateKeys); } @@ -173,18 +173,18 @@ static Object doRecord( } @CompilerDirectives.TruffleBoundary - public static Rql2TypeWithProperties getTipe(Rql2RecordType t, int index) { - return (Rql2TypeWithProperties) t.atts().apply(index).tipe(); + public static SnapiTypeWithProperties getTipe(SnapiRecordType t, int index) { + return (SnapiTypeWithProperties) t.atts().apply(index).tipe(); } @CompilerDirectives.TruffleBoundary - public static String getIdn(Rql2RecordType t, int index) { + public static String getIdn(SnapiRecordType t, int index) { return t.atts().apply(index).idn(); } @Specialization(guards = {"isIntervalKind(t)"}) @CompilerDirectives.TruffleBoundary - static IntervalObject doInterval(Node node, Input input, Rql2TypeWithProperties t) { + static IntervalObject doInterval(Node node, Input input, SnapiTypeWithProperties t) { int years = input.readInt(); int months = input.readInt(); int weeks = input.readInt(); @@ -198,7 +198,7 @@ static IntervalObject doInterval(Node node, Input input, Rql2TypeWithProperties @Specialization(guards = {"isTimeKind(t)"}) @CompilerDirectives.TruffleBoundary - static TimeObject doTime(Node node, Input input, Rql2TypeWithProperties t) { + static TimeObject doTime(Node node, Input input, SnapiTypeWithProperties t) { int hours = input.readInt(); int minutes = input.readInt(); int seconds = input.readInt(); @@ -209,7 +209,7 @@ static TimeObject doTime(Node node, Input input, Rql2TypeWithProperties t) { @Specialization(guards = {"isDateKind(t)"}) @CompilerDirectives.TruffleBoundary - static DateObject doDate(Node node, Input input, Rql2TypeWithProperties t) { + static DateObject doDate(Node node, Input input, SnapiTypeWithProperties t) { int year = input.readInt(); int month = input.readInt(); int day = input.readInt(); @@ -218,7 +218,7 @@ static DateObject doDate(Node node, Input input, Rql2TypeWithProperties t) { @Specialization(guards = {"isTimestampKind(t)"}) @CompilerDirectives.TruffleBoundary - static TimestampObject doTimestamp(Node node, Input input, Rql2TypeWithProperties t) { + static TimestampObject doTimestamp(Node node, Input input, SnapiTypeWithProperties t) { int year = input.readInt(); int month = input.readInt(); int day = input.readInt(); @@ -239,55 +239,55 @@ static TimestampObject doTimestamp(Node node, Input input, Rql2TypeWithPropertie @Specialization(guards = {"isBooleanKind(t)"}) @CompilerDirectives.TruffleBoundary - static boolean doBoolean(Node node, Input input, Rql2TypeWithProperties t) { + static boolean doBoolean(Node node, Input input, SnapiTypeWithProperties t) { return input.readBoolean(); } @Specialization(guards = {"isStringKind(t)"}) @CompilerDirectives.TruffleBoundary - static String doString(Node node, Input input, Rql2TypeWithProperties t) { + static String doString(Node node, Input input, SnapiTypeWithProperties t) { return input.readString(); } @Specialization(guards = {"isDecimalKind(t)"}) @CompilerDirectives.TruffleBoundary - static DecimalObject doDecimal(Node node, Input input, Rql2TypeWithProperties t) { + static DecimalObject doDecimal(Node node, Input input, SnapiTypeWithProperties t) { return new DecimalObject(new BigDecimal(input.readString())); } @Specialization(guards = {"isDoubleKind(t)"}) @CompilerDirectives.TruffleBoundary - static double doDouble(Node node, Input input, Rql2TypeWithProperties t) { + static double doDouble(Node node, Input input, SnapiTypeWithProperties t) { return input.readDouble(); } @Specialization(guards = {"isFloatKind(t)"}) @CompilerDirectives.TruffleBoundary - static float doFloat(Node node, Input input, Rql2TypeWithProperties t) { + static float doFloat(Node node, Input input, SnapiTypeWithProperties t) { return input.readFloat(); } @Specialization(guards = {"isLongKind(t)"}) @CompilerDirectives.TruffleBoundary - static long doLong(Node node, Input input, Rql2TypeWithProperties t) { + static long doLong(Node node, Input input, SnapiTypeWithProperties t) { return input.readLong(); } @Specialization(guards = {"isIntKind(t)"}) @CompilerDirectives.TruffleBoundary - static int doInt(Node node, Input input, Rql2TypeWithProperties t) { + static int doInt(Node node, Input input, SnapiTypeWithProperties t) { return input.readInt(); } @Specialization(guards = {"isShortKind(t)"}) @CompilerDirectives.TruffleBoundary - static short doShort(Node node, Input input, Rql2TypeWithProperties t) { + static short doShort(Node node, Input input, SnapiTypeWithProperties t) { return input.readShort(); } @Specialization(guards = {"isByteKind(t)"}) @CompilerDirectives.TruffleBoundary - static byte doByte(Node node, Input input, Rql2TypeWithProperties t) { + static byte doByte(Node node, Input input, SnapiTypeWithProperties t) { return input.readByte(); } } @@ -298,18 +298,18 @@ static byte doByte(Node node, Input input, Rql2TypeWithProperties t) { @GenerateInline public abstract static class KryoWriteNode extends Node { - private static final Rql2TypeProperty isTryable = new Rql2IsTryableTypeProperty(); - private static final Rql2TypeProperty isNullable = new Rql2IsNullableTypeProperty(); + private static final SnapiTypeProperty isTryable = new SnapiIsTryableTypeProperty(); + private static final SnapiTypeProperty isNullable = new SnapiIsNullableTypeProperty(); public abstract void execute( - Node node, Output output, Rql2TypeWithProperties type, Object maybeTryable); + Node node, Output output, SnapiTypeWithProperties type, Object maybeTryable); @Specialization(guards = "isTryable(type)") @CompilerDirectives.TruffleBoundary static void doTryable( Node node, Output output, - Rql2TypeWithProperties type, + SnapiTypeWithProperties type, Object maybeTryable, @Bind("$node") Node thisNode, @Cached TryableNullableNodes.IsErrorNode isErrorNode, @@ -320,7 +320,7 @@ static void doTryable( kryo.execute( thisNode, output, - (Rql2TypeWithProperties) type.cloneAndRemoveProp(isTryable), + (SnapiTypeWithProperties) type.cloneAndRemoveProp(isTryable), maybeTryable); } else { ErrorObject error = (ErrorObject) maybeTryable; @@ -333,7 +333,7 @@ static void doTryable( static void doNullable( Node node, Output output, - Rql2TypeWithProperties type, + SnapiTypeWithProperties type, Object maybeOption, @Bind("$node") Node thisNode, @Cached TryableNullableNodes.IsNullNode isNullNode, @@ -344,7 +344,7 @@ static void doNullable( kryo.execute( thisNode, output, - (Rql2TypeWithProperties) type.cloneAndRemoveProp(isNullable), + (SnapiTypeWithProperties) type.cloneAndRemoveProp(isNullable), maybeOption); } } @@ -354,7 +354,7 @@ static void doNullable( static void doList( Node node, Output output, - Rql2TypeWithProperties type, + SnapiTypeWithProperties type, Object o, @Bind("$node") Node thisNode, @Cached ListNodes.SizeNode sizeNode, @@ -362,8 +362,8 @@ static void doList( @Cached(inline = false) @Cached.Exclusive KryoWriteNode kryo) { int size = (int) sizeNode.execute(thisNode, o); output.writeInt(size); - Rql2TypeWithProperties elementType = - (Rql2TypeWithProperties) ((Rql2ListType) type).innerType(); + SnapiTypeWithProperties elementType = + (SnapiTypeWithProperties) ((SnapiListType) type).innerType(); for (int i = 0; i < size; i++) { Object item = getNode.execute(thisNode, o, i); kryo.execute(thisNode, output, elementType, item); @@ -375,7 +375,7 @@ static void doList( static void doIterable( Node node, Output output, - Rql2TypeWithProperties type, + SnapiTypeWithProperties type, Object o, @Bind("$node") Node thisNode, @Cached GeneratorNodes.GeneratorInitNode generatorInitNode, @@ -384,8 +384,8 @@ static void doIterable( @Cached GeneratorNodes.GeneratorCloseNode generatorCloseNode, @Cached(inline = false) @Cached.Exclusive KryoWriteNode kryo, @Cached(inline = false) IterableNodes.GetGeneratorNode getGeneratorNode) { - Rql2TypeWithProperties elementType = - (Rql2TypeWithProperties) ((Rql2IterableType) type).innerType(); + SnapiTypeWithProperties elementType = + (SnapiTypeWithProperties) ((SnapiIterableType) type).innerType(); Object generator = getGeneratorNode.execute(thisNode, o); try { generatorInitNode.execute(thisNode, generator); @@ -424,7 +424,7 @@ public static KryoWriteNode[] createKryoWrite(int size) { static void doRecord( Node node, Output output, - Rql2RecordType type, + SnapiRecordType type, Object o, @Bind("$node") Node thisNode, @Cached RecordNodes.GetKeysNode getKeysNode, @@ -441,13 +441,13 @@ static void doRecord( } @CompilerDirectives.TruffleBoundary - public static Rql2TypeWithProperties getTipe(Rql2RecordType t, int index) { - return (Rql2TypeWithProperties) t.atts().apply(index).tipe(); + public static SnapiTypeWithProperties getTipe(SnapiRecordType t, int index) { + return (SnapiTypeWithProperties) t.atts().apply(index).tipe(); } @Specialization(guards = {"isDateKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doDate(Node node, Output output, Rql2TypeWithProperties type, DateObject o) { + static void doDate(Node node, Output output, SnapiTypeWithProperties type, DateObject o) { LocalDate date = o.getDate(); output.writeInt(date.getYear()); output.writeInt(date.getMonthValue()); @@ -456,7 +456,7 @@ static void doDate(Node node, Output output, Rql2TypeWithProperties type, DateOb @Specialization(guards = {"isTimeKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doTime(Node node, Output output, Rql2TypeWithProperties type, TimeObject o) { + static void doTime(Node node, Output output, SnapiTypeWithProperties type, TimeObject o) { LocalTime time = o.getTime(); output.writeInt(time.getHour()); output.writeInt(time.getMinute()); @@ -467,7 +467,7 @@ static void doTime(Node node, Output output, Rql2TypeWithProperties type, TimeOb @Specialization(guards = {"isTimestampKind(type)"}) @CompilerDirectives.TruffleBoundary static void doTimestamp( - Node node, Output output, Rql2TypeWithProperties type, TimestampObject o) { + Node node, Output output, SnapiTypeWithProperties type, TimestampObject o) { LocalDateTime timestamp = o.getTimestamp(); output.writeInt(timestamp.getYear()); output.writeInt(timestamp.getMonthValue()); @@ -481,7 +481,7 @@ static void doTimestamp( @Specialization(guards = {"isIntervalKind(type)"}) @CompilerDirectives.TruffleBoundary static void doInterval( - Node node, Output output, Rql2TypeWithProperties type, IntervalObject o) { + Node node, Output output, SnapiTypeWithProperties type, IntervalObject o) { output.writeInt(o.getYears()); output.writeInt(o.getMonths()); output.writeInt(o.getWeeks()); @@ -494,55 +494,55 @@ static void doInterval( @Specialization(guards = {"isByteKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doByte(Node node, Output output, Rql2TypeWithProperties type, byte o) { + static void doByte(Node node, Output output, SnapiTypeWithProperties type, byte o) { output.writeByte(o); } @Specialization(guards = {"isShortKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doShort(Node node, Output output, Rql2TypeWithProperties type, short o) { + static void doShort(Node node, Output output, SnapiTypeWithProperties type, short o) { output.writeShort(o); } @Specialization(guards = {"isIntKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doInt(Node node, Output output, Rql2TypeWithProperties type, int o) { + static void doInt(Node node, Output output, SnapiTypeWithProperties type, int o) { output.writeInt(o); } @Specialization(guards = {"isLongKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doLong(Node node, Output output, Rql2TypeWithProperties type, long o) { + static void doLong(Node node, Output output, SnapiTypeWithProperties type, long o) { output.writeLong(o); } @Specialization(guards = {"isFloatKind(type)"}) @CompilerDirectives.TruffleBoundary - static void doFloat(Node node, Output output, Rql2TypeWithProperties type, float o) { + static void doFloat(Node node, Output output, SnapiTypeWithProperties type, float o) { output.writeFloat(o); } @Specialization @CompilerDirectives.TruffleBoundary - static void doDouble(Node node, Output output, Rql2TypeWithProperties type, double o) { + static void doDouble(Node node, Output output, SnapiTypeWithProperties type, double o) { output.writeDouble(o); } @Specialization @CompilerDirectives.TruffleBoundary - static void doDecimal(Node node, Output output, Rql2TypeWithProperties type, DecimalObject o) { + static void doDecimal(Node node, Output output, SnapiTypeWithProperties type, DecimalObject o) { output.writeString(o.getBigDecimal().toString()); } @Specialization @CompilerDirectives.TruffleBoundary - static void doString(Node node, Output output, Rql2TypeWithProperties type, String o) { + static void doString(Node node, Output output, SnapiTypeWithProperties type, String o) { output.writeString(o); } @Specialization @CompilerDirectives.TruffleBoundary - static void doBool(Node node, Output output, Rql2TypeWithProperties type, boolean o) { + static void doBool(Node node, Output output, SnapiTypeWithProperties type, boolean o) { output.writeBoolean(o); } } diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java index b48462fd5..0a9184f58 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/or/OrObject.java @@ -17,7 +17,7 @@ import com.oracle.truffle.api.library.CachedLibrary; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.runtime.list.StringList; @ExportLibrary(InteropLibrary.class) @@ -45,7 +45,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return Rql2Language.class; + return SnapiLanguage.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java index cfb591fd3..7c8727f5f 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DateObject.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import java.time.LocalDate; @ExportLibrary(InteropLibrary.class) @@ -57,7 +57,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return Rql2Language.class; + return SnapiLanguage.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java index f23dbf195..b72adc605 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/DecimalObject.java @@ -18,7 +18,7 @@ import com.oracle.truffle.api.interop.TruffleObject; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import java.math.BigDecimal; @ExportLibrary(InteropLibrary.class) @@ -40,7 +40,7 @@ final boolean hasLanguage() { @ExportMessage final Class> getLanguage() { - return Rql2Language.class; + return SnapiLanguage.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java index 26d512fcb..e4ae35205 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/primitives/LocationObject.java @@ -19,8 +19,8 @@ import com.oracle.truffle.api.interop.UnsupportedMessageException; import com.oracle.truffle.api.library.ExportLibrary; import com.oracle.truffle.api.library.ExportMessage; -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription; -import com.rawlabs.snapi.frontend.rql2.extensions.LocationDescription$; +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription; +import com.rawlabs.snapi.frontend.snapi.extensions.LocationDescription$; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import com.rawlabs.utils.sources.api.Location; import com.rawlabs.utils.sources.bytestream.api.ByteStreamLocation; diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java index 1525326e8..9837a4982 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/DuplicateKeyRecord.java @@ -25,7 +25,7 @@ import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; import com.rawlabs.compiler.utils.RecordFieldsNaming; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import java.util.Arrays; import java.util.Vector; @@ -95,7 +95,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return Rql2Language.class; + return SnapiLanguage.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java index e97282802..c8bbb6179 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecord.java @@ -22,7 +22,7 @@ import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.api.object.DynamicObject; import com.oracle.truffle.api.object.Shape; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; @ExportLibrary(InteropLibrary.class) public class PureRecord extends DynamicObject implements TruffleObject { @@ -37,7 +37,7 @@ boolean hasLanguage() { @ExportMessage Class> getLanguage() { - return Rql2Language.class; + return SnapiLanguage.class; } @ExportMessage diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java index 86fd91804..229e5dabf 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/record/PureRecordNodes.java @@ -20,7 +20,7 @@ import com.oracle.truffle.api.nodes.NodeInfo; import com.oracle.truffle.api.nodes.UnexpectedResultException; import com.oracle.truffle.api.object.DynamicObjectLibrary; -import com.rawlabs.snapi.truffle.Rql2Language; +import com.rawlabs.snapi.truffle.SnapiLanguage; import com.rawlabs.snapi.truffle.ast.PropertyType; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleInternalErrorException; @@ -139,7 +139,7 @@ static Object exec( @Cached AddPropNode addPropNode, @Cached GetKeysNode getKeysNode, @Cached GetValueNode getValueNode) { - Rql2Language lang = Rql2Language.get(thisNode); + SnapiLanguage lang = SnapiLanguage.get(thisNode); PureRecord newRecord = lang.createPureRecord(); Object[] keys = getKeysNode.execute(thisNode, pureRecord); for (Object k : keys) { diff --git a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java index 36f91fbf5..1799122c2 100644 --- a/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java +++ b/snapi-truffle/src/main/java/com/rawlabs/snapi/truffle/runtime/utils/KryoFootPrint.java @@ -13,52 +13,52 @@ package com.rawlabs.snapi.truffle.runtime.utils; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; -import com.rawlabs.snapi.frontend.rql2.source.*; +import com.rawlabs.snapi.frontend.snapi.source.*; import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException; import scala.collection.immutable.Vector; public class KryoFootPrint { - private static final Rql2TypeProperty nullable = new Rql2IsNullableTypeProperty(); - private static final Rql2TypeProperty tryable = new Rql2IsTryableTypeProperty(); + private static final SnapiTypeProperty nullable = new SnapiIsNullableTypeProperty(); + private static final SnapiTypeProperty tryable = new SnapiIsTryableTypeProperty(); @TruffleBoundary - public static int of(Rql2TypeWithProperties type) { + public static int of(SnapiTypeWithProperties type) { if (type.props().contains(tryable)) { - return 1 + of((Rql2TypeWithProperties) type.cloneAndRemoveProp(tryable)); + return 1 + of((SnapiTypeWithProperties) type.cloneAndRemoveProp(tryable)); } else if (type.props().contains(nullable)) { - return 1 + of((Rql2TypeWithProperties) type.cloneAndRemoveProp(nullable)); - } else if (type instanceof Rql2BoolType || type instanceof Rql2ByteType) { + return 1 + of((SnapiTypeWithProperties) type.cloneAndRemoveProp(nullable)); + } else if (type instanceof SnapiBoolType || type instanceof SnapiByteType) { return 1; - } else if (type instanceof Rql2ShortType) { + } else if (type instanceof SnapiShortType) { return 2; - } else if (type instanceof Rql2IntType || type instanceof Rql2FloatType) { + } else if (type instanceof SnapiIntType || type instanceof SnapiFloatType) { return 4; - } else if (type instanceof Rql2LongType || type instanceof Rql2DoubleType) { + } else if (type instanceof SnapiLongType || type instanceof SnapiDoubleType) { return 8; - } else if (type instanceof Rql2DecimalType) { + } else if (type instanceof SnapiDecimalType) { return 32; - } else if (type instanceof Rql2StringType) { + } else if (type instanceof SnapiStringType) { return 32; - } else if (type instanceof Rql2BinaryType) { + } else if (type instanceof SnapiBinaryType) { return 256; - } else if (type instanceof Rql2TimeType - || type instanceof Rql2IntervalType - || type instanceof Rql2DateType - || type instanceof Rql2TimestampType) { + } else if (type instanceof SnapiTimeType + || type instanceof SnapiIntervalType + || type instanceof SnapiDateType + || type instanceof SnapiTimestampType) { return 16; - } else if (type instanceof Rql2ListType) { - return 4 + 30 * of((Rql2TypeWithProperties) ((Rql2ListType) (type)).innerType()); - } else if (type instanceof Rql2IterableType) { + } else if (type instanceof SnapiListType) { + return 4 + 30 * of((SnapiTypeWithProperties) ((SnapiListType) (type)).innerType()); + } else if (type instanceof SnapiIterableType) { // same as ListType - return 4 + 30 * of((Rql2TypeWithProperties) ((Rql2IterableType) (type)).innerType()); - } else if (type instanceof Rql2UndefinedType) { + return 4 + 30 * of((SnapiTypeWithProperties) ((SnapiIterableType) (type)).innerType()); + } else if (type instanceof SnapiUndefinedType) { return 0; - } else if (type instanceof Rql2RecordType) { - Vector atts = ((Rql2RecordType) (type)).atts(); + } else if (type instanceof SnapiRecordType) { + Vector atts = ((SnapiRecordType) (type)).atts(); int n = atts.size(); int size = 0; - for (int i = 0; i < n; i++) size += of((Rql2TypeWithProperties) atts.apply(i).tipe()); + for (int i = 0; i < n; i++) size += of((SnapiTypeWithProperties) atts.apply(i).tipe()); return size; } else { throw new TruffleRuntimeException("Unknown type: " + type); diff --git a/snapi-truffle/src/main/java/module-info.java b/snapi-truffle/src/main/java/module-info.java index 401fcef38..b8a9f458e 100644 --- a/snapi-truffle/src/main/java/module-info.java +++ b/snapi-truffle/src/main/java/module-info.java @@ -10,7 +10,7 @@ * licenses/APL.txt. */ -import com.rawlabs.snapi.truffle.Rql2LanguageProvider; +import com.rawlabs.snapi.truffle.SnapiLanguageProvider; module raw.snapi.truffle { // Direct dependencies @@ -54,5 +54,5 @@ requires jul.to.slf4j; provides com.oracle.truffle.api.provider.TruffleLanguageProvider with - Rql2LanguageProvider; + SnapiLanguageProvider; }