More reorg

raw-labs · Aug 23, 2024 · 7ceda2a · 7ceda2a
1 parent 90a2476
commit 7ceda2a
Show file tree

Hide file tree

Showing 816 changed files with 2,942 additions and 3,372 deletions.
diff --git a/...bs/snapi/truffle/runtime/Rql2Context.java → ...om/rawlabs/snapi/truffle/Rql2Context.java b/...bs/snapi/truffle/runtime/Rql2Context.java → ...om/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,8 +21,8 @@
 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.TruffleRuntimeException;
-import com.rawlabs.snapi.truffle.runtime.runtime.function.FunctionRegistry;
+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;

diff --git a/...s/snapi/truffle/runtime/Rql2Language.java → ...m/rawlabs/snapi/truffle/Rql2Language.java b/...s/snapi/truffle/runtime/Rql2Language.java → ...m/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;
@@ -39,10 +39,10 @@
 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.truffle.emitter.compiler.TruffleEmit;
-import com.rawlabs.snapi.truffle.runtime.runtime.exceptions.TruffleValidationException;
-import com.rawlabs.snapi.truffle.runtime.runtime.record.DuplicateKeyRecord;
-import com.rawlabs.snapi.truffle.runtime.runtime.record.PureRecord;
+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;

diff --git a/...pi/truffle/runtime/Rql2LanguageCache.java → ...labs/snapi/truffle/Rql2LanguageCache.java b/...pi/truffle/runtime/Rql2LanguageCache.java → ...labs/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;

diff --git a/...bs/snapi/truffle/runtime/Rql2Options.java → ...om/rawlabs/snapi/truffle/Rql2Options.java b/...bs/snapi/truffle/runtime/Rql2Options.java → ...om/rawlabs/snapi/truffle/Rql2Options.java
@@ -10,7 +10,7 @@
  * licenses/APL.txt.
  */
 
-package com.rawlabs.snapi.truffle.runtime;
+package com.rawlabs.snapi.truffle;
 
 import org.graalvm.options.OptionDescriptor;
 import org.graalvm.options.OptionDescriptors;

diff --git a/...labs/snapi/truffle/runtime/Rql2Types.java → .../com/rawlabs/snapi/truffle/Rql2Types.java b/...labs/snapi/truffle/runtime/Rql2Types.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,

diff --git a/...snapi/truffle/runtime/ast/BinaryNode.java → ...rawlabs/snapi/truffle/ast/BinaryNode.java b/...snapi/truffle/runtime/ast/BinaryNode.java → ...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/runtime/ExpressionNode.java → ...abs/snapi/truffle/ast/ExpressionNode.java b/...snapi/truffle/runtime/ExpressionNode.java → ...abs/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,9 +19,11 @@
 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(Rql2Types.class)
 @GenerateWrapper

diff --git a/...le/runtime/ast/ProgramExpressionNode.java → ...pi/truffle/ast/ProgramExpressionNode.java b/...le/runtime/ast/ProgramExpressionNode.java → ...pi/truffle/ast/ProgramExpressionNode.java
@@ -10,15 +10,14 @@
  * 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.Rql2Language;
+import com.rawlabs.snapi.truffle.Rql2Language;
 
 public final class ProgramExpressionNode extends RootNode {
 

diff --git a/...fle/runtime/ast/ProgramStatementNode.java → ...api/truffle/ast/ProgramStatementNode.java b/...fle/runtime/ast/ProgramStatementNode.java → ...api/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.Rql2Language;
-import com.rawlabs.snapi.truffle.runtime.StatementNode;
+import com.rawlabs.snapi.truffle.Rql2Language;
 
 public final class ProgramStatementNode extends RootNode {
 

diff --git a/...s/snapi/truffle/runtime/PropertyType.java → ...wlabs/snapi/truffle/ast/PropertyType.java b/...s/snapi/truffle/runtime/PropertyType.java → ...wlabs/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/runtime/StatementNode.java → ...labs/snapi/truffle/ast/StatementNode.java b/.../snapi/truffle/runtime/StatementNode.java → ...labs/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/...e/runtime/boundary/TruffleBoundaries.java → .../snapi/truffle/ast/TruffleBoundaries.java b/...e/runtime/boundary/TruffleBoundaries.java → .../snapi/truffle/ast/TruffleBoundaries.java
@@ -10,7 +10,7 @@
  * 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;

diff --git a/...snapi/truffle/runtime/ast/TypeGuards.java → ...rawlabs/snapi/truffle/ast/TypeGuards.java b/...snapi/truffle/runtime/ast/TypeGuards.java → ...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/...runtime/ast/controlflow/ExpBlockNode.java → ...truffle/ast/controlflow/ExpBlockNode.java b/...runtime/ast/controlflow/ExpBlockNode.java → ...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<StatementNode> {

diff --git a/...ntime/ast/controlflow/IfThenElseNode.java → ...uffle/ast/controlflow/IfThenElseNode.java b/...ntime/ast/controlflow/IfThenElseNode.java → ...uffle/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.TruffleRuntimeException;
+import com.rawlabs.snapi.truffle.ast.ExpressionNode;
+import com.rawlabs.snapi.truffle.runtime.exceptions.TruffleRuntimeException;
 
 public final class IfThenElseNode extends ExpressionNode {
 

diff --git a/...ns/aggregation/AggregateMultipleNode.java → ...ns/aggregation/AggregateMultipleNode.java b/...ns/aggregation/AggregateMultipleNode.java → ...ns/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.TruffleRuntimeException;
-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 {
 

diff --git a/...ions/aggregation/AggregateSingleNode.java → ...ions/aggregation/AggregateSingleNode.java b/...ions/aggregation/AggregateSingleNode.java → ...ions/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.TruffleRuntimeException;
-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 {
 

diff --git a/...expressions/aggregation/Aggregations.java → ...expressions/aggregation/Aggregations.java b/...expressions/aggregation/Aggregations.java → ...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/...ressions/aggregation/AggregatorNodes.java → ...ressions/aggregation/AggregatorNodes.java b/...ressions/aggregation/AggregatorNodes.java → ...ressions/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.runtime.operators.OperatorNodes;
+import com.rawlabs.snapi.truffle.runtime.primitives.NullObject;
+import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes;
 
 public class AggregatorNodes {
   @NodeInfo(shortName = "Aggregator.Zero")

diff --git a/...ntime/ast/expressions/binary/AndNode.java → ...uffle/ast/expressions/binary/AndNode.java b/...ntime/ast/expressions/binary/AndNode.java → ...uffle/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.runtime.primitives.NullObject;
+import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodes;
+import com.rawlabs.snapi.truffle.ast.tryable_nullable.TryableNullableNodesFactory;
 
 public final class AndNode extends ExpressionNode {
 

diff --git a/...ntime/ast/expressions/binary/DivNode.java → ...uffle/ast/expressions/binary/DivNode.java b/...ntime/ast/expressions/binary/DivNode.java → ...uffle/ast/expressions/binary/DivNode.java
@@ -10,17 +10,17 @@
  * 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 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/...untime/ast/expressions/binary/EqNode.java → ...ruffle/ast/expressions/binary/EqNode.java b/...untime/ast/expressions/binary/EqNode.java → ...ruffle/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.ExpressionNode;
+import com.rawlabs.snapi.truffle.ast.BinaryNode;
+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/...untime/ast/expressions/binary/GeNode.java → ...ruffle/ast/expressions/binary/GeNode.java b/...untime/ast/expressions/binary/GeNode.java → ...ruffle/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.ExpressionNode;
+import com.rawlabs.snapi.truffle.ast.BinaryNode;
+import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodes;
+import com.rawlabs.snapi.truffle.runtime.operators.OperatorNodesFactory;
 
 public class GeNode extends BinaryNode {