Skip to content

Commit c9e5ffb

Browse files
committed
Genericize LKQL: switch Libadalang.MemberReference to LangkitSupport.MemberReferenceInterface
This change is basically a simple renaming of Libadalang.MemberReference to LangkitSupport.MemberReferenceInterface and adaptations to the new interfaces provided by LangkitSupport.
1 parent d3da5da commit c9e5ffb

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
LangkitSupport.AnalysisUnit.class,
4848
Libadalang.RewritingContext.class,
4949
LangkitSupport.RewritingNodeInterface.class,
50-
Libadalang.MemberReference.class,
50+
LangkitSupport.MemberReferenceInterface.class,
5151
LKQLNamespace.class,
5252
LKQLObject.class,
5353
Truthy.class,

lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/methods/RewritingContextMethods.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
package com.adacore.lkql_jit.built_ins.methods;
77

8+
import com.adacore.langkit_support.LangkitSupport.MemberReferenceInterface;
89
import com.adacore.langkit_support.LangkitSupport.RewritingContextInterface;
910
import com.adacore.langkit_support.LangkitSupport.RewritingNodeInterface;
1011
import com.adacore.libadalang.Libadalang;
11-
import com.adacore.libadalang.Libadalang.MemberReference;
1212
import com.adacore.lkql_jit.annotations.BuiltInMethod;
1313
import com.adacore.lkql_jit.annotations.BuiltinMethodContainer;
1414
import com.adacore.lkql_jit.built_ins.BuiltInBody;
@@ -71,7 +71,7 @@ public Object executeGeneric(
7171
VirtualFrame frame,
7272
RewritingContextInterface ctx,
7373
Object node,
74-
MemberReference memberRef,
74+
MemberReferenceInterface memberRef,
7575
Object newValue
7676
) {
7777
// Get the method arguments

lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Expr.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ public LangkitSupport.RewritingNodeInterface executeRewritingNode(VirtualFrame f
288288
* @throws UnexpectedResultException If the node cannot be evaluated as a member reference.
289289
*/
290290
@SuppressWarnings("unused")
291-
public Libadalang.MemberReference executeMemberReference(VirtualFrame frame)
291+
public LangkitSupport.MemberReferenceInterface executeMemberReference(VirtualFrame frame)
292292
throws UnexpectedResultException {
293-
return LKQLTypeSystemGen.expectMemberReference(executeGeneric(frame));
293+
return LKQLTypeSystemGen.expectMemberReferenceInterface(executeGeneric(frame));
294294
}
295295
}

lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/dot/MemberRefAccess.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package com.adacore.lkql_jit.nodes.expressions.dot;
77

8+
import com.adacore.langkit_support.LangkitSupport;
89
import com.adacore.libadalang.Libadalang;
910
import com.adacore.lkql_jit.exception.LKQLRuntimeException;
1011
import com.adacore.lkql_jit.nodes.Identifier;
@@ -21,7 +22,7 @@ public class MemberRefAccess extends Expr {
2122
// ----- Attributes -----
2223

2324
/** The member reference, result of this node execution. */
24-
private final Libadalang.MemberReference memberRef;
25+
private final LangkitSupport.MemberReferenceInterface memberRef;
2526

2627
// ----- Constructors -----
2728

@@ -45,7 +46,7 @@ public Object executeGeneric(VirtualFrame frame) {
4546
}
4647

4748
@Override
48-
public Libadalang.MemberReference executeMemberReference(VirtualFrame frame) {
49+
public LangkitSupport.MemberReferenceInterface executeMemberReference(VirtualFrame frame) {
4950
return this.memberRef;
5051
}
5152

0 commit comments

Comments
 (0)