From 56886a8b005bfe6f89b0d8eae59a542ca011149a Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 12 Jan 2025 22:07:08 +0000 Subject: Remove params from declare-native-function Shid instruction --- .../org/shedlang/compiler/shid/ShidSerializer.java | 4 +-- .../instructions/ShidDeclareNativeFunction.java | 36 ++-------------------- 2 files changed, 4 insertions(+), 36 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/shid/ShidSerializer.java b/src/main/java/org/shedlang/compiler/shid/ShidSerializer.java index 76526fd0..54cd53e5 100644 --- a/src/main/java/org/shedlang/compiler/shid/ShidSerializer.java +++ b/src/main/java/org/shedlang/compiler/shid/ShidSerializer.java @@ -76,9 +76,7 @@ public class ShidSerializer { case ShidDeclareNativeFunction declareNativeFunction -> treeListIndented( treeIdentifier("declare-native-function"), - treeNamed("name", treeString(declareNativeFunction.name())), - positionalParamsToTree(declareNativeFunction.positionalParams()), - namedParamsToTree(declareNativeFunction.namedParams()) + treeNamed("name", treeString(declareNativeFunction.name())) ); case ShidDefineEffect defineEffectInstruction -> diff --git a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDeclareNativeFunction.java b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDeclareNativeFunction.java index f74f447b..47bc6e01 100644 --- a/src/main/java/org/shedlang/compiler/shid/instructions/ShidDeclareNativeFunction.java +++ b/src/main/java/org/shedlang/compiler/shid/instructions/ShidDeclareNativeFunction.java @@ -1,11 +1,7 @@ package org.shedlang.compiler.shid.instructions; -import org.pcollections.PVector; import org.shedlang.compiler.sources.Source; import org.shedlang.compiler.sources.Sources; -import org.shedlang.compiler.util.P; - -import java.util.List; /** * Push a native function value onto the temporary value stack with the given @@ -13,8 +9,6 @@ import java.util.List; */ public record ShidDeclareNativeFunction( String name, - List positionalParams, - List namedParams, Source source ) implements ShidInstruction { @Override @@ -24,47 +18,23 @@ public record ShidDeclareNativeFunction( public static Builder builder() { return new Builder( - "f", - P.vector(), - P.vector() + "f" ); } public record Builder( - String name, - PVector positionalParams, - PVector namedParams + String name ) { public ShidDeclareNativeFunction build() { return new ShidDeclareNativeFunction( name, - positionalParams, - namedParams, Sources.NULL ); } public Builder withName(String name) { return new Builder( - name, - this.positionalParams, - this.namedParams - ); - } - - public Builder addPositionalParam(String name) { - return new Builder( - this.name, - this.positionalParams.plus(new ShidParam(name, Sources.NULL)), - this.namedParams - ); - } - - public Builder addNamedParam(String name) { - return new Builder( - this.name, - this.positionalParams, - this.namedParams.plus(new ShidParam(name, Sources.NULL)) + name ); } } -- cgit v1.2.3