From e099fb1a2dba6e9f94fe9d23cb4a95f04b91e0ff Mon Sep 17 00:00:00 2001 From: Hugo Guerrier Date: Wed, 5 Jun 2024 16:09:33 +0200 Subject: [PATCH 1/3] minor: Remove useless string concatenation in translator --- .../lkql_jit/langkit_translator/passes/TranslationPass.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java index ef464fdb2..b6e658e5a 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java @@ -102,7 +102,7 @@ private RuntimeException translationError(Liblkqllang.LkqlNode node, String mess private RuntimeException multipleSameNameKeys(Liblkqllang.LkqlNode node, String key) { throw translationError( - node, "Multiple keys with the same name in the " + "object: \"" + key + "\""); + node, "Multiple keys with the same name in the object: \"" + key + "\""); } /** From cae48e1a94a5d6449f8b1516bd0d884ee6f344eb Mon Sep 17 00:00:00 2001 From: Hugo Guerrier Date: Wed, 5 Jun 2024 16:00:11 +0200 Subject: [PATCH 2/3] Remove unused declaration in LKQL JIT sources --- .../com/adacore/lkql_jit/LKQLContext.java | 18 ---- .../built_ins/BuiltInSelectorValue.java | 36 ------- .../lkql_jit/built_ins/BuiltInsHolder.java | 1 - .../built_ins/selectors/BuiltInSelector.java | 30 ------ .../adacore/lkql_jit/checker/BaseChecker.java | 32 ------- .../exception/LKQLRuntimeException.java | 6 -- .../lkql_jit/exception/LangkitException.java | 11 +-- .../passes/framing_utils/ScriptFrames.java | 6 -- .../framing_utils/ScriptFramesBuilder.java | 7 -- .../declarations/selector/SelectorArm.java | 10 -- .../declarations/selector/SelectorExpr.java | 93 ------------------- .../lkql_jit/nodes/expressions/FunExpr.java | 8 -- .../ComprehensionAssoc.java | 8 -- .../nodes/expressions/match/MatchArm.java | 10 -- .../lkql_jit/nodes/patterns/SplatPattern.java | 5 - .../root_nodes/ListComprehensionRootNode.java | 6 -- .../nodes/root_nodes/SelectorRootNode.java | 11 --- .../com/adacore/lkql_jit/runtime/Cell.java | 4 - .../com/adacore/lkql_jit/runtime/Closure.java | 12 --- .../com/adacore/lkql_jit/utils/Constants.java | 9 -- .../lkql_jit/utils/LKQLTypesHelper.java | 3 - .../lkql_jit/utils/functions/ArrayUtils.java | 35 ------- .../utils/functions/BigIntegerUtils.java | 22 ----- .../lkql_jit/utils/functions/ListUtils.java | 14 --- .../utils/functions/ReflectionUtils.java | 4 +- .../lkql_jit/utils/functions/StringUtils.java | 56 ----------- 26 files changed, 2 insertions(+), 455 deletions(-) delete mode 100644 lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInSelectorValue.java delete mode 100644 lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/BuiltInSelector.java delete mode 100644 lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorExpr.java diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java index 3210a5875..5ec388c5f 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLContext.java @@ -143,15 +143,10 @@ public final class LKQLContext { @CompilerDirectives.CompilationFinal(dimensions = 1) private Libadalang.ScenarioVariable[] scenarioVars = null; - private Boolean useAutoProvider = null; - /** The ada files passed through the command line. */ @CompilerDirectives.CompilationFinal(dimensions = 1) private String[] files = null; - /** The error printing mode. */ - @CompilerDirectives.CompilationFinal private String errorMode = null; - /** Whether the checker is in debug mode. */ @CompilerDirectives.CompilationFinal private Boolean checkerDebug = null; @@ -343,18 +338,6 @@ public boolean isCheckerDebug() { return this.checkerDebug; } - /** - * Get the error handling mode. - * - * @return The mode in a string. - */ - public String getErrorMode() { - if (this.errorMode == null) { - this.errorMode = this.env.getOptions().get(LKQLLanguage.errorMode); - } - return this.errorMode; - } - /** * Get the directories to get the rules from. * @@ -395,7 +378,6 @@ private void invalidateOptionCaches() { this.isVerbose = null; this.projectFile = null; this.files = null; - this.errorMode = null; this.ruleInstances = null; this.instancesArgsCache = new HashMap<>(); this.ruleDirectories = null; diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInSelectorValue.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInSelectorValue.java deleted file mode 100644 index 34be03195..000000000 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInSelectorValue.java +++ /dev/null @@ -1,36 +0,0 @@ -// -// Copyright (C) 2005-2024, AdaCore -// SPDX-License-Identifier: GPL-3.0-or-later -// - -package com.adacore.lkql_jit.built_ins; - -import com.adacore.lkql_jit.built_ins.values.LKQLSelector; -import com.adacore.lkql_jit.nodes.declarations.selector.SelectorArm; -import com.adacore.lkql_jit.nodes.root_nodes.SelectorRootNode; -import com.adacore.lkql_jit.runtime.Closure; - -/** - * This class represents the base of the built-in selector values. - * - * @author Hugo GUERRIER - */ -public class BuiltInSelectorValue extends LKQLSelector { - - // ----- Constructors ----- - - /** - * Create a new built-in selector value. - * - * @param name The name of the selector. - * @param documentation The documentation of the selector. - * @param arms The arms for the selector execution. - */ - public BuiltInSelectorValue(String name, String documentation, SelectorArm[] arms) { - super( - new SelectorRootNode(null, null, false, -1, -1, arms), - Closure.EMPTY, - name, - documentation); - } -} diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInsHolder.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInsHolder.java index fba7b9b77..f0e8463f6 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInsHolder.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/BuiltInsHolder.java @@ -7,7 +7,6 @@ import com.adacore.lkql_jit.built_ins.functions.*; import com.adacore.lkql_jit.built_ins.methods.*; -import com.adacore.lkql_jit.built_ins.selectors.*; import com.adacore.lkql_jit.checker.built_ins.NodeCheckerFunction; import com.adacore.lkql_jit.checker.built_ins.UnitCheckerFunction; import com.adacore.lkql_jit.utils.LKQLTypesHelper; diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/BuiltInSelector.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/BuiltInSelector.java deleted file mode 100644 index 960252e39..000000000 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/BuiltInSelector.java +++ /dev/null @@ -1,30 +0,0 @@ -// -// Copyright (C) 2005-2024, AdaCore -// SPDX-License-Identifier: GPL-3.0-or-later -// - -package com.adacore.lkql_jit.built_ins.selectors; - -import com.adacore.lkql_jit.built_ins.values.LKQLSelector; - -/** - * This interface defines the LKQL built-in selector factories. - * - * @author Hugo GUERRIER - */ -public interface BuiltInSelector { - - /** - * Get the name of the build in selector. - * - * @return The name of the selector. - */ - String getName(); - - /** - * Get the value of the built-in selector. - * - * @return The selector value. - */ - LKQLSelector getValue(); -} diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/checker/BaseChecker.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/checker/BaseChecker.java index d66a15892..df72dc8ea 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/checker/BaseChecker.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/checker/BaseChecker.java @@ -102,42 +102,10 @@ public String getMessage() { return message; } - public String getHelp() { - return help; - } - public boolean isFollowGenericInstantiations() { return followGenericInstantiations; } - public String getCategory() { - return category; - } - - public String getSubcategory() { - return subcategory; - } - - public Remediation getRemediation() { - return remediation; - } - - public long getExecutionCost() { - return executionCost; - } - - public boolean isParametricExemption() { - return parametricExemption; - } - - public String getImpact() { - return impact; - } - - public String getTarget() { - return target; - } - // ----- Setters ----- public void setAlias(String alias) { diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java index 68a8567e8..7f28a86f3 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java @@ -114,12 +114,6 @@ public static LKQLRuntimeException ignoredExpressionReturn(Node location) { "Can't ignore the return value of an expr in a block expr", location); } - /** Create a new exception when a key appears many times in the same object literal. */ - public static LKQLRuntimeException multipleSameNameKeys(String key, Node location) { - return LKQLRuntimeException.fromMessage( - "Multiple keys with the same name in the object: \"" + key + "\"", location); - } - // --- Symbol exception /** diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LangkitException.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LangkitException.java index fb13f1562..529f9c950 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LangkitException.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LangkitException.java @@ -20,9 +20,6 @@ public final class LangkitException extends AbstractTruffleException { @Serial private static final long serialVersionUID = 1755847711876252095L; - /** Kind of the Langkit exception. */ - private final String kind; - /** Message of the exception. */ private final String msg; @@ -34,22 +31,16 @@ public final class LangkitException extends AbstractTruffleException { /** * Create a new Langkit exception. * - * @param kind The kind of the exception. * @param msg The message of the exception. * @param location The location of the exception. */ - public LangkitException(String kind, String msg, SourceSection location) { - this.kind = kind; + public LangkitException(String msg, SourceSection location) { this.msg = msg; this.location = location; } // ----- Getters ----- - public String getKind() { - return this.kind; - } - public String getMsg() { return this.msg; } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFrames.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFrames.java index 051279854..b92e7e692 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFrames.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFrames.java @@ -56,12 +56,6 @@ public ScriptFrames( this.current = null; } - // ----- Getters ----- - - public AbstractNodeFrame getCurrent() { - return this.current; - } - // ----- Instance methods ----- // --- Frame methods diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFramesBuilder.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFramesBuilder.java index 133cb4ccf..96f325e73 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFramesBuilder.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/framing_utils/ScriptFramesBuilder.java @@ -38,12 +38,6 @@ public ScriptFramesBuilder() { this.current = null; } - // ----- Getters ----- - - public NodeFrameBuilder getCurrent() { - return this.current; - } - // ----- Instance methods ----- // --- Frame methods @@ -253,7 +247,6 @@ public ScriptFrames.AbstractNodeFrame build(final ScriptFrames.AbstractNodeFrame : new ScriptFrames.NodeFrame(this.node, parent); // Add all bindings to the node frame - final boolean saveNames = this.node instanceof Liblkqllang.TopLevelList; for (String binding : this.bindings) { res.addBinding(binding); } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java index 884f2cc0c..1c3419b63 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java @@ -50,16 +50,6 @@ public SelectorArm(SourceSection location, BasePattern pattern, Expr expr) { this.expr = expr; } - // ----- Getters ----- - - public BasePattern getPattern() { - return pattern; - } - - public Expr getExpr() { - return expr; - } - // ----- Execution methods ----- /** diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorExpr.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorExpr.java deleted file mode 100644 index b1103ed56..000000000 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorExpr.java +++ /dev/null @@ -1,93 +0,0 @@ -// -// Copyright (C) 2005-2024, AdaCore -// SPDX-License-Identifier: GPL-3.0-or-later -// - -package com.adacore.lkql_jit.nodes.declarations.selector; - -import com.adacore.lkql_jit.nodes.LKQLNode; -import com.adacore.lkql_jit.nodes.expressions.Expr; -import com.oracle.truffle.api.frame.VirtualFrame; -import com.oracle.truffle.api.source.SourceSection; - -/** - * This node represents an expression in the right part of a selector arm. - * - * @author Hugo GUERRIER - */ -public final class SelectorExpr extends LKQLNode { - - // ----- Attributes ----- - - /** The mode of the selector expression. */ - private final Mode mode; - - // ----- Children ----- - - /** The expression of the selector expression. */ - @Child - @SuppressWarnings("FieldMayBeFinal") - private Expr expr; - - public final boolean hasUnpack; - - // ----- Constructors ----- - - /** - * Create a new selector expression node. - * - * @param location The location of the node in the source. - * @param mode The mode of the expression. - * @param expr The expression. - * @param hasUnpack - */ - public SelectorExpr(SourceSection location, Mode mode, Expr expr, boolean hasUnpack) { - super(location); - this.mode = mode; - this.expr = expr; - this.hasUnpack = hasUnpack; - } - - // ----- Getters ----- - - public Mode getMode() { - return this.mode; - } - - // ----- Execution methods ----- - - /** - * @see - * com.adacore.lkql_jit.nodes.LKQLNode#executeGeneric(com.oracle.truffle.api.frame.VirtualFrame) - */ - @Override - public Object executeGeneric(VirtualFrame frame) { - return this.expr.executeGeneric(frame); - } - - // ----- Override methods ----- - - /** - * @see - * com.adacore.lkql_jit.nodes.LKQLNode#executeGeneric(com.oracle.truffle.api.frame.VirtualFrame) - */ - @Override - public String toString(int indentLevel) { - return this.nodeRepresentation( - indentLevel, new String[] {"mode"}, new Object[] {this.mode}); - } - - // ----- Inner classes ----- - - /** This enum represents the mode of the selector expression. */ - public enum Mode { - /** Default mode, return the expression. */ - DEFAULT, - - /** Recursive mode, return and recurse on the result. */ - REC, - - /** Skip mode, recurse on the result but don't return it. */ - SKIP - } -} diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunExpr.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunExpr.java index 4c17fffce..22d757200 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunExpr.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunExpr.java @@ -41,13 +41,6 @@ public final class FunExpr extends Expr { /** The default values of the parameters. */ private final Expr[] parameterValues; - // ----- Children ----- - - /** The body of the function. */ - @Child - @SuppressWarnings("FieldMayBeFinal") - private Expr body; - // ----- Constructors ----- /** @@ -72,7 +65,6 @@ public FunExpr( new FunctionRootNode(LKQLLanguage.getLanguage(this), frameDescriptor, false, body); this.parameterNames = new String[parameters.length]; this.parameterValues = new Expr[parameters.length]; - this.body = body; this.documentation = documentation; this.initParams(parameters); diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/list_comprehension/ComprehensionAssoc.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/list_comprehension/ComprehensionAssoc.java index 68f931116..e87158d3a 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/list_comprehension/ComprehensionAssoc.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/list_comprehension/ComprehensionAssoc.java @@ -55,18 +55,10 @@ public ComprehensionAssoc(SourceSection location, String name, int slot, Expr co // ----- Getters ----- - public String getName() { - return name; - } - public int getSlot() { return slot; } - public Expr getCollection() { - return collection; - } - // ----- Execution methods ----- /** diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java index 10cfaef1f..db87f3f8d 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java @@ -46,16 +46,6 @@ public MatchArm(SourceSection location, BasePattern pattern, Expr expr) { this.expr = expr; } - // ----- Getters ----- - - public BasePattern getPattern() { - return pattern; - } - - public Expr getExpr() { - return expr; - } - // ----- Execution methods ----- /** diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java index 8bffe541b..f001de24f 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java @@ -12,11 +12,6 @@ public class SplatPattern extends ValuePattern { private final int slot; - public SplatPattern(SourceSection location) { - super(location); - this.slot = -1; - } - public SplatPattern(SourceSection location, int slot) { super(location); this.slot = slot; diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/ListComprehensionRootNode.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/ListComprehensionRootNode.java index a8d6b7dc8..04002bfd9 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/ListComprehensionRootNode.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/ListComprehensionRootNode.java @@ -51,12 +51,6 @@ public ListComprehensionRootNode( this.result = result; } - // ----- Getters ----- - - public Expr getResult() { - return result; - } - // ----- Execution methods ----- /** diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java index 1c56df671..a69e63699 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java @@ -8,7 +8,6 @@ import com.adacore.lkql_jit.built_ins.values.LKQLDepthValue; import com.adacore.lkql_jit.built_ins.values.LKQLRecValue; import com.adacore.lkql_jit.nodes.declarations.selector.SelectorArm; -import com.adacore.lkql_jit.nodes.declarations.selector.SelectorExpr; import com.adacore.lkql_jit.utils.functions.FrameUtils; import com.oracle.truffle.api.TruffleLanguage; import com.oracle.truffle.api.frame.FrameDescriptor; @@ -112,14 +111,4 @@ public Object execute(VirtualFrame frame) { // Return the result return res; } - - // ----- Inner classes ----- - - /** - * This record represents a result of a call to the selector on a node. - * - * @param mode The mode of the result. - * @param result The result value. - */ - public record SelectorCallResult(SelectorExpr.Mode mode, Object result) {} } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Cell.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Cell.java index 405c37212..302a3e3a8 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Cell.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Cell.java @@ -45,10 +45,6 @@ public Object getRef() { // ----- Setters ----- - public void clear() { - this.ref = null; - } - public void setRef(Object ref) { this.ref = ref; } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Closure.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Closure.java index ee0a292a5..4c652b532 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Closure.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/runtime/Closure.java @@ -82,18 +82,6 @@ public Cell[] getContent() { return content; } - // ----- Instance methods ----- - - /** - * Get the cell at the given slot. - * - * @param slot The slot to get the cell at. - * @return The cell. - */ - public Cell get(final int slot) { - return this.content[slot]; - } - // ----- Override methods ----- @Override diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/Constants.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/Constants.java index e96e9de7d..60b23bca0 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/Constants.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/Constants.java @@ -48,9 +48,6 @@ public class Constants { /** Default name of a function. */ public static final String FUNCTION_DEFAULT_NAME = "lambda"; - /** Default documentation of a function. */ - public static final String FUNCTION_DEFAULT_DOC = ""; - // ----- Built-in symbols ----- /** Symbol which contains the "this" value in selectors. */ @@ -65,12 +62,6 @@ public class Constants { /** Symbol which contains the minimal depth value in selector calls. */ public static final String MIN_DEPTH_SYMBOL = "min_depth"; - /** Special object key for LKQL config file to define rule alias. */ - public static final String ALIAS_NAME_SYMBOL = "instance_name"; - - /** Special object key for LKQL config file to define the rule instance name. IOW rule alias. */ - public static final String INSTANCE_NAME_SYMBOL = "instance_name"; - // ----- Special annotations ----- /** The memoization annotation string value. */ diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/LKQLTypesHelper.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/LKQLTypesHelper.java index 902382ac4..65225adeb 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/LKQLTypesHelper.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/LKQLTypesHelper.java @@ -23,9 +23,6 @@ public final class LKQLTypesHelper { // ----- Static values ----- - /** The string representing the LKQL indexable interface. */ - public static final String LKQL_INDEXABLE = "Indexable"; - /** The string representing the LKQL iterable interface. */ public static final String LKQL_ITERABLE = "Iterable"; diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ArrayUtils.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ArrayUtils.java index 64c744734..fdfa00f4d 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ArrayUtils.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ArrayUtils.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Objects; /** * Util functions to manipulate the arrays in the JIT implementation. @@ -33,28 +32,6 @@ public static int indexOf(T[] arr, T val) { return -1; } - /** - * Compare the two array. - * - * @param left The left array. - * @param right The right array. - * @param The type of the array elements. - * @return The result of the comparison. - */ - @CompilerDirectives.TruffleBoundary - public static boolean equals(T[] left, T[] right) { - // Compare the length - if (left.length != right.length) return false; - - // Compare the elements - for (int i = 0; i < left.length; i++) { - if (!Objects.equals(left[i], right[i])) return false; - } - - // Return the success - return true; - } - /** * Concatenate two array of arbitrary types. * @@ -86,16 +63,4 @@ public static List unique(T[] array) { } return resList; } - - /** - * Get the string representation of a given array. - * - * @param array The array to get the representation from. - * @param The type of the array elements. - * @return The string representation of the array. - */ - @CompilerDirectives.TruffleBoundary - public static String toString(T[] array) { - return Arrays.toString(array); - } } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/BigIntegerUtils.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/BigIntegerUtils.java index ba5e19423..9fad626f7 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/BigIntegerUtils.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/BigIntegerUtils.java @@ -15,28 +15,6 @@ */ public final class BigIntegerUtils { - /** - * Get a big integer from a long value. - * - * @param l The long value. - * @return The big integer. - */ - @CompilerDirectives.TruffleBoundary - public static BigInteger valueOf(long l) { - return BigInteger.valueOf(l); - } - - /** - * Get a big integer from an int. - * - * @param i The int value. - * @return The big integer. - */ - @CompilerDirectives.TruffleBoundary - public static BigInteger valueOf(int i) { - return BigInteger.valueOf(i); - } - /** * Get the negative value of the given big integer. * diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ListUtils.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ListUtils.java index d6c154043..06f22bd8c 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ListUtils.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ListUtils.java @@ -15,20 +15,6 @@ * @author Hugo GUERRIER */ public final class ListUtils { - - /** - * Get if a list contains an element. - * - * @param list The list to verify. - * @param elem The element to find. - * @param The type of the element. - * @return True if the list contains the element. - */ - @CompilerDirectives.TruffleBoundary - public static boolean contains(List list, T elem) { - return list.contains(elem); - } - @SafeVarargs @CompilerDirectives.TruffleBoundary public static void addAll(List lst, T... elems) { diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ReflectionUtils.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ReflectionUtils.java index 2a4e7d221..ca6af2a27 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ReflectionUtils.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/ReflectionUtils.java @@ -151,9 +151,7 @@ public static Object callProperty( Throwable targetException = e.getTargetException(); if (targetException instanceof Libadalang.LangkitException langkitException) { throw new LangkitException( - langkitException.kind.toString(), - langkitException.getMessage(), - caller.getSourceSection()); + langkitException.getMessage(), caller.getSourceSection()); } else if (targetException instanceof Error error) { // Forward fatal errors without wrapping them in LKQLRuntimeExceptions: those // shouldn't diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/StringUtils.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/StringUtils.java index f6dbfa181..794df4468 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/StringUtils.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/StringUtils.java @@ -25,10 +25,8 @@ public final class StringUtils { // --- The color constants public static final String ANSI_RESET = "\u001B[0m"; - public static final String ANSI_RED = "\u001B[31m"; public static final String ANSI_BLUE = "\u001B[34m"; public static final String ANSI_YELLOW = "\u001B[33m"; - public static final String ANSI_GREY = "\u001B[38;5;246m"; public static final String ANSI_BOLD = "\u001B[1m"; // ----- Class methods ----- @@ -48,18 +46,6 @@ public static String concat(String... strings) { return builder.toString(); } - /** - * Compare the given strings ignoring the casing of them. - * - * @param left The left string. - * @param right The right string. - * @return True if the strings are equals, false else. - */ - @CompilerDirectives.TruffleBoundary - public static boolean equalsIgnoreCase(String left, String right) { - return left.equalsIgnoreCase(right); - } - /** * Fill the given string with space character to get to the given size. * @@ -143,48 +129,6 @@ public static String toUpperCase(String toUpper) { return toUpper.toUpperCase(Locale.ROOT); } - /** - * Translate a string to a snake_case one. - * - * @param source The source string. - * @return The transformed string. - */ - @CompilerDirectives.TruffleBoundary - public static String toSnakeCase(String source) { - StringBuilder res = new StringBuilder(); - for (int i = 0; i < source.length(); i++) { - char curChar = source.charAt(i); - if (Character.isUpperCase(curChar)) { - res.append('_'); - curChar = Character.toLowerCase(curChar); - } - res.append(curChar); - } - return res.toString(); - } - - /** - * Get a camel case formatted string from a snake case source. - * - * @param source The source string. - * @return The camel case. - */ - @CompilerDirectives.TruffleBoundary - public static String toCamelCase(String source) { - StringBuilder res = new StringBuilder(); - int i = 0; - while (i < source.length()) { - char curChar = source.charAt(i); - if (curChar == '_') { - i++; - curChar = Character.toUpperCase(source.charAt(i)); - } - res.append(curChar); - i++; - } - return res.toString(); - } - /** * Create a string representation with escaped character. * From 0ef57d9313bd296ee67caa98a90974917d8ad5c5 Mon Sep 17 00:00:00 2001 From: Hugo Guerrier Date: Wed, 5 Jun 2024 17:40:45 +0200 Subject: [PATCH 3/3] Annotate all purposely unused declarations --- .../built_ins/functions/DocumentBuiltins.java | 4 +++- .../built_ins/values/LKQLFunction.java | 2 +- .../built_ins/values/LKQLProperty.java | 2 +- .../built_ins/values/LKQLSelector.java | 2 +- .../ListComprehensionDispatcher.java | 2 +- .../nodes/dispatchers/SelectorDispatcher.java | 2 +- .../lkql_jit/nodes/expressions/Expr.java | 18 ++++++++++++++++++ .../nodes/expressions/dot/DotAccess.java | 2 +- .../nodes/expressions/dot/SafeDotAccess.java | 2 +- .../lkql_jit/nodes/patterns/BoolPattern.java | 6 ++++-- .../nodes/patterns/IntegerPattern.java | 6 ++++-- .../lkql_jit/nodes/patterns/ListPattern.java | 4 +++- .../lkql_jit/nodes/patterns/ObjectPattern.java | 4 +++- .../lkql_jit/nodes/patterns/RegexPattern.java | 9 ++++++--- .../lkql_jit/nodes/patterns/TuplePattern.java | 4 +++- 15 files changed, 51 insertions(+), 18 deletions(-) diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/DocumentBuiltins.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/DocumentBuiltins.java index 22a56df8b..cc22c2965 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/DocumentBuiltins.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/DocumentBuiltins.java @@ -20,7 +20,9 @@ public class DocumentBuiltins { public static final String NAME = "document_builtins"; @CompilerDirectives.TruffleBoundary - public static String documentBuiltinsImpl(MaterializedFrame frame, FunCall call) { + public static String documentBuiltinsImpl( + @SuppressWarnings("unused") MaterializedFrame frame, + @SuppressWarnings("unused") FunCall call) { var sw = new StringWriter(); try (TextWriter writer = new TextWriter(sw)) { writer.write("Standard library\n"); diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLFunction.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLFunction.java index 17bbff623..621da9cdf 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLFunction.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLFunction.java @@ -148,7 +148,7 @@ public static class Execute { /** Execute the function with the cached strategy. */ @Specialization(guards = "function.getCallTarget() == directCallNode.getCallTarget()") protected static Object doCached( - final LKQLFunction function, + @SuppressWarnings("unused") final LKQLFunction function, final Object[] arguments, @Cached("create(function.getCallTarget())") DirectCallNode directCallNode) { return directCallNode.call(arguments); diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLProperty.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLProperty.java index ffdcddd8e..68060985e 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLProperty.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLProperty.java @@ -141,7 +141,7 @@ public boolean isExecutable() { /** Placeholder function for the Truffle DSL. */ @ExportMessage - public Object execute(Object[] arguments) + public Object execute(@SuppressWarnings("unused") Object[] arguments) throws UnsupportedTypeException, ArityException, UnsupportedMessageException { // TODO (issue #143): implement this method to execute the property as a simple function return null; diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLSelector.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLSelector.java index 4b8a71dfb..243c6ee01 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLSelector.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLSelector.java @@ -118,7 +118,7 @@ public boolean isExecutable() { /** Placeholder function for the Truffle DSL. */ @ExportMessage - public Object execute(Object[] arguments) + public Object execute(@SuppressWarnings("unused") Object[] arguments) throws UnsupportedTypeException, ArityException, UnsupportedMessageException { // TODO (issue #143): implement this method to execute the selector as a simple function // returning a selector list diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/ListComprehensionDispatcher.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/ListComprehensionDispatcher.java index ae72dc349..1d7f5eb94 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/ListComprehensionDispatcher.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/ListComprehensionDispatcher.java @@ -40,7 +40,7 @@ public abstract class ListComprehensionDispatcher extends Node { */ @Specialization(guards = "rootNode.getRealCallTarget() == directCallNode.getCallTarget()") protected static Object executeCached( - ListComprehensionRootNode rootNode, + @SuppressWarnings("unused") ListComprehensionRootNode rootNode, Object[] arguments, @Cached("create(rootNode.getRealCallTarget())") DirectCallNode directCallNode) { return directCallNode.call(arguments); diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java index 1f001adc6..c80156717 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java @@ -36,7 +36,7 @@ public abstract LKQLRecValue executeDispatch( */ @Specialization(guards = "rootNode.getRealCallTarget() == directCallNode.getCallTarget()") protected static LKQLRecValue executeCached( - SelectorRootNode rootNode, + @SuppressWarnings("unused") SelectorRootNode rootNode, Cell[] closure, LKQLDepthValue node, @Cached("create(rootNode.getRealCallTarget())") DirectCallNode directCallNode) { diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Expr.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Expr.java index 87281eb6b..18c9a66f9 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Expr.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Expr.java @@ -47,6 +47,7 @@ protected Expr(SourceSection location) { * @return The result of the node execution as unit. * @throws UnexpectedResultException If the node cannot be evaluated as a unit value. */ + @SuppressWarnings("unused") public LKQLUnit executeUnit(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLUnit(executeGeneric(frame)); } @@ -58,6 +59,7 @@ public LKQLUnit executeUnit(VirtualFrame frame) throws UnexpectedResultException * @return The result of the node execution as nullish. * @throws UnexpectedResultException If the node cannot be evaluated as a nullish value. */ + @SuppressWarnings("unused") public Nullish executeNullish(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectNullish(executeGeneric(frame)); } @@ -69,6 +71,7 @@ public Nullish executeNullish(VirtualFrame frame) throws UnexpectedResultExcepti * @return The result of the node execution as a boolean. * @throws UnexpectedResultException If the node cannot be evaluated as a boolean. */ + @SuppressWarnings("unused") public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectBoolean(executeGeneric(frame)); } @@ -80,6 +83,7 @@ public boolean executeBoolean(VirtualFrame frame) throws UnexpectedResultExcepti * @return The result of the node execution as a long. * @throws UnexpectedResultException If the node cannot be evaluated as a long. */ + @SuppressWarnings("unused") public long executeLong(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLong(executeGeneric(frame)); } @@ -91,6 +95,7 @@ public long executeLong(VirtualFrame frame) throws UnexpectedResultException { * @return The result of the node execution as a big integer. * @throws UnexpectedResultException If the node cannot be evaluated as a big integer. */ + @SuppressWarnings("unused") public BigInteger executeBigInteger(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectBigInteger(executeGeneric(frame)); } @@ -102,6 +107,7 @@ public BigInteger executeBigInteger(VirtualFrame frame) throws UnexpectedResultE * @return The result of the node execution as a string. * @throws UnexpectedResultException If the node cannot be evaluated as a string. */ + @SuppressWarnings("unused") public String executeString(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectString(executeGeneric(frame)); } @@ -113,6 +119,7 @@ public String executeString(VirtualFrame frame) throws UnexpectedResultException * @return The result of the node execution as a function value. * @throws UnexpectedResultException If the node cannot be evaluated as a function. */ + @SuppressWarnings("unused") public LKQLFunction executeFunction(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLFunction(executeGeneric(frame)); } @@ -124,6 +131,7 @@ public LKQLFunction executeFunction(VirtualFrame frame) throws UnexpectedResultE * @return The result of the node execution as a property reference value. * @throws UnexpectedResultException If the node cannot be evaluated as a property reference. */ + @SuppressWarnings("unused") public LKQLProperty executeProperty(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLProperty(executeGeneric(frame)); } @@ -135,6 +143,7 @@ public LKQLProperty executeProperty(VirtualFrame frame) throws UnexpectedResultE * @return The result of the node execution as a selector value. * @throws UnexpectedResultException If the node cannot be evaluated as a selector. */ + @SuppressWarnings("unused") public LKQLSelector executeSelector(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLSelector(executeGeneric(frame)); } @@ -146,6 +155,7 @@ public LKQLSelector executeSelector(VirtualFrame frame) throws UnexpectedResultE * @return The result of the node execution as a tuple value. * @throws UnexpectedResultException If the node cannot be evaluated as a tuple. */ + @SuppressWarnings("unused") public LKQLTuple executeTuple(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLTuple(executeGeneric(frame)); } @@ -157,6 +167,7 @@ public LKQLTuple executeTuple(VirtualFrame frame) throws UnexpectedResultExcepti * @return The result of the node execution as a list value. * @throws UnexpectedResultException If the node cannot be evaluated as a list. */ + @SuppressWarnings("unused") public LKQLList executeList(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLList(executeGeneric(frame)); } @@ -168,6 +179,7 @@ public LKQLList executeList(VirtualFrame frame) throws UnexpectedResultException * @return The result of the node execution as a lazy list value. * @throws UnexpectedResultException If the node cannot be evaluated as a lazy list. */ + @SuppressWarnings("unused") public LKQLLazyList executeLazyList(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLLazyList(executeGeneric(frame)); } @@ -179,6 +191,7 @@ public LKQLLazyList executeLazyList(VirtualFrame frame) throws UnexpectedResultE * @return The result of the node execution as an indexable value. * @throws UnexpectedResultException If the node cannot be evaluated as an indexable. */ + @SuppressWarnings("unused") public Indexable executeIndexable(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectIndexable(executeGeneric(frame)); } @@ -190,6 +203,7 @@ public Indexable executeIndexable(VirtualFrame frame) throws UnexpectedResultExc * @return The result of the node execution as an iterable value. * @throws UnexpectedResultException If the node cannot be evaluated as an iterable. */ + @SuppressWarnings("unused") public Iterable executeIterable(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectIterable(executeGeneric(frame)); } @@ -201,6 +215,7 @@ public Iterable executeIterable(VirtualFrame frame) throws UnexpectedResultExcep * @return The result of the node execution as an object value. * @throws UnexpectedResultException If the node cannot be evaluated as an object. */ + @SuppressWarnings("unused") public LKQLObject executeObject(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLObject(executeGeneric(frame)); } @@ -212,6 +227,7 @@ public LKQLObject executeObject(VirtualFrame frame) throws UnexpectedResultExcep * @return The result of the node execution as a namespace value. * @throws UnexpectedResultException If the node cannot be evaluated as a namespace. */ + @SuppressWarnings("unused") public LKQLNamespace executeNamespace(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLNamespace(executeGeneric(frame)); } @@ -223,6 +239,7 @@ public LKQLNamespace executeNamespace(VirtualFrame frame) throws UnexpectedResul * @return The result of the node execution as a lkql value. * @throws UnexpectedResultException If the node cannot be evaluated as a lkql value. */ + @SuppressWarnings("unused") public LKQLValue executeValue(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectLKQLValue(executeGeneric(frame)); } @@ -234,6 +251,7 @@ public LKQLValue executeValue(VirtualFrame frame) throws UnexpectedResultExcepti * @return The result of the node execution as an ada node. * @throws UnexpectedResultException If the node cannot be evaluated as an ada node. */ + @SuppressWarnings("unused") public Libadalang.AdaNode executeNode(VirtualFrame frame) throws UnexpectedResultException { return LKQLTypeSystemGen.expectAdaNode(executeGeneric(frame)); } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/DotAccess.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/DotAccess.java index 84cf06d6d..1bb582496 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/DotAccess.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/DotAccess.java @@ -126,7 +126,7 @@ protected Object onNamespace( }, limit = "1") protected Object onNodeCached( - Libadalang.AdaNode receiver, + @SuppressWarnings("unused") Libadalang.AdaNode receiver, @Cached("create(member.getName(), receiver)") LKQLProperty property, @Cached("property.isField()") boolean isField) { // If the method is a field diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/SafeDotAccess.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/SafeDotAccess.java index 84bdb0144..bfbc019e9 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/SafeDotAccess.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/SafeDotAccess.java @@ -74,7 +74,7 @@ protected SafeDotAccess(SourceSection location, Identifier member) { }, limit = "1") protected Object onNodeCached( - Libadalang.AdaNode receiver, + @SuppressWarnings("unused") Libadalang.AdaNode receiver, @Cached("create(member.getName(), receiver)") LKQLProperty property, @Cached("property.isField()") boolean isField) { // If the method is a field diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java index f18d193ea..bc49f4734 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java @@ -21,12 +21,14 @@ protected BoolPattern(SourceSection location, boolean toMatch) { } @Specialization - public boolean onBool(VirtualFrame frame, boolean val) { + public boolean onBool(@SuppressWarnings("unused") VirtualFrame frame, boolean val) { return val == toMatch; } @Fallback - public boolean onOther(VirtualFrame frame, Object other) { + public boolean onOther( + @SuppressWarnings("unused") VirtualFrame frame, + @SuppressWarnings("unused") Object other) { return false; } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java index 1f79a71f9..5508a5366 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java @@ -20,12 +20,14 @@ public IntegerPattern(SourceSection loc, long toMatch) { } @Specialization - public boolean onInt(VirtualFrame frame, long val) { + public boolean onInt(@SuppressWarnings("unused") VirtualFrame frame, long val) { return val == toMatch; } @Fallback - public boolean onOther(VirtualFrame frame, Object other) { + public boolean onOther( + @SuppressWarnings("unused") VirtualFrame frame, + @SuppressWarnings("unused") Object other) { return false; } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java index 07a25ea23..74c3480d4 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java @@ -51,7 +51,9 @@ else if (!pattern.executeValue(frame, list.get(i))) { } @Fallback - public boolean onOther(VirtualFrame frame, Object other) { + public boolean onOther( + @SuppressWarnings("unused") VirtualFrame frame, + @SuppressWarnings("unused") Object other) { return false; } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java index c66c6c90b..db0d80c41 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java @@ -100,7 +100,9 @@ public boolean onObject( } @Fallback - public boolean onOther(VirtualFrame frame, Object other) { + public boolean onOther( + @SuppressWarnings("unused") VirtualFrame frame, + @SuppressWarnings("unused") Object other) { return false; } } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java index bbf58b5b0..eca47337f 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java @@ -39,17 +39,20 @@ public RegexPattern(SourceSection location, String regex) { } @Specialization - public boolean onAdaNode(VirtualFrame frame, Libadalang.AdaNode node) { + public boolean onAdaNode( + @SuppressWarnings("unused") VirtualFrame frame, Libadalang.AdaNode node) { return node != LKQLNull.INSTANCE && this.pattern.contains(node.getText()); } @Specialization - public boolean onString(VirtualFrame frame, String value) { + public boolean onString(@SuppressWarnings("unused") VirtualFrame frame, String value) { return pattern.contains(value); } @Fallback - public boolean onOther(VirtualFrame frame, Object other) { + public boolean onOther( + @SuppressWarnings("unused") VirtualFrame frame, + @SuppressWarnings("unused") Object other) { return false; } diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java index 1f700628b..5bdd09b47 100644 --- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java +++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java @@ -38,7 +38,9 @@ public boolean onTuple(VirtualFrame frame, LKQLTuple tuple) { } @Fallback - public boolean onOther(VirtualFrame frame, Object other) { + public boolean onOther( + @SuppressWarnings("unused") VirtualFrame frame, + @SuppressWarnings("unused") Object other) { return false; }