diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/CommandResponseQueue.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/CommandResponseQueue.java similarity index 93% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/CommandResponseQueue.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/CommandResponseQueue.java index 28475739f..d81410a7b 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/CommandResponseQueue.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/CommandResponseQueue.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.responseParser; +package net.zscript.javaclient.responseparser; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -8,9 +8,9 @@ import java.util.Queue; import java.util.function.Consumer; -import net.zscript.javaclient.responseParser.ResponseParser.ResponseHeader; -import net.zscript.javaclient.zcodeApi.CommandSeqElement; -import net.zscript.javaclient.zcodeApi.ZscriptCommandBuilder; +import net.zscript.javaclient.responseparser.ResponseParser.ResponseHeader; +import net.zscript.javaclient.zscriptapi.CommandSeqElement; +import net.zscript.javaclient.zscriptapi.ZscriptCommandBuilder; public class CommandResponseQueue implements CommandResponseSystem { private static final int MAX_SENT = 10; @@ -166,14 +166,14 @@ public void send(final CommandSeqElement seq) { } @Override - public void send(final byte[] zcode, final Consumer callback) { + public void send(final byte[] zscript, final Consumer callback) { if (sent.size() == 0) { - ByteArrEntry el = new ByteArrEntry(callback, zcode); + ByteArrEntry el = new ByteArrEntry(callback, zscript); sent.add(el); connection.send(el.compile()); canPipeline = false; } else { - toSend.add(new ByteArrEntry(callback, zcode)); + toSend.add(new ByteArrEntry(callback, zscript)); } } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/CommandResponseSystem.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/CommandResponseSystem.java similarity index 58% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/CommandResponseSystem.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/CommandResponseSystem.java index 3bc936e99..efb0fce9b 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/CommandResponseSystem.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/CommandResponseSystem.java @@ -1,15 +1,15 @@ -package net.zscript.javaclient.responseParser; +package net.zscript.javaclient.responseparser; import java.util.function.Consumer; -import net.zscript.javaclient.zcodeApi.CommandSeqElement; +import net.zscript.javaclient.zscriptapi.CommandSeqElement; public interface CommandResponseSystem { void send(CommandSeqElement seq); void send(ZscriptAddress addr, byte[] data); - void send(byte[] zcode, Consumer callback); + void send(byte[] zscript, Consumer callback); ResponseAddressingSystem getResponseAddressingSystem(); } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/ResponseAddressingSystem.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/ResponseAddressingSystem.java similarity index 95% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/ResponseAddressingSystem.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/ResponseAddressingSystem.java index a09c14b4b..ad0072ed9 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/ResponseAddressingSystem.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/ResponseAddressingSystem.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.responseParser; +package net.zscript.javaclient.responseparser; import java.util.HashMap; import java.util.Map; diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/ResponseParser.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/ResponseParser.java similarity index 92% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/ResponseParser.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/ResponseParser.java index fbcc82cc7..1de67e2c6 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseParser/ResponseParser.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/responseparser/ResponseParser.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.responseParser; +package net.zscript.javaclient.responseparser; import java.util.ArrayList; import java.util.HashSet; @@ -6,10 +6,10 @@ import java.util.Optional; import java.util.Set; -import net.zscript.javaclient.zcodeApi.CommandSeqElement; -import net.zscript.javaclient.zcodeApi.ZscriptCommand; -import net.zscript.javaclient.zcodeApi.ZscriptUnparsedCommandResponse; -import net.zscript.javaclient.zcodeApi.ZscriptCommand.ZcodeSequencePath; +import net.zscript.javaclient.zscriptapi.CommandSeqElement; +import net.zscript.javaclient.zscriptapi.ZscriptCommand; +import net.zscript.javaclient.zscriptapi.ZscriptUnparsedCommandResponse; +import net.zscript.javaclient.zscriptapi.ZscriptCommand.ZscriptSequencePath; import net.zscript.javareceiver.tokenizer.OptIterator; import net.zscript.javareceiver.tokenizer.TokenBuffer; import net.zscript.javareceiver.tokenizer.TokenExtendingBuffer; @@ -147,8 +147,8 @@ public static void parseFullResponse(final CommandSeqElement command, final byte private static void matchMarkers(final CommandSeqElement command, final List markers, final List tokenAfterMarkers) { ZscriptCommand current = null; - ZcodeSequencePath successPath = ZscriptCommand.findFirstCommand(command); - ZcodeSequencePath failPath = ZscriptCommand.findFirstCommand(command); + ZscriptSequencePath successPath = ZscriptCommand.findFirstCommand(command); + ZscriptSequencePath failPath = ZscriptCommand.findFirstCommand(command); Set sentResponses = new HashSet<>(); int offset = 0; @@ -199,7 +199,7 @@ private static void matchMarkers(final CommandSeqElement command, final List markers; private final ZscriptCommand next; - public ZcodeSequencePath(List markers, ZscriptCommand next) { + public ZscriptSequencePath(List markers, ZscriptCommand next) { this.markers = markers; this.next = next; } - public ZcodeSequencePath(List markers, ZcodeSequencePath rest) { + public ZscriptSequencePath(List markers, ZscriptSequencePath rest) { this.markers = new ArrayList<>(markers); this.markers.addAll(rest.markers); this.next = rest.next; @@ -32,7 +32,7 @@ public ZscriptCommand getNext() { public abstract void response(ZscriptUnparsedCommandResponse resp); - public static ZcodeSequencePath findFirstCommand(final CommandSeqElement start) { + public static ZscriptSequencePath findFirstCommand(final CommandSeqElement start) { CommandSeqElement current = start; CommandSeqElement prev = null; List markers = new ArrayList<>(); @@ -50,10 +50,10 @@ public static ZcodeSequencePath findFirstCommand(final CommandSeqElement start) markers.add((byte) '('); } } - return new ZcodeSequencePath(markers, (ZscriptCommand) current); + return new ZscriptSequencePath(markers, (ZscriptCommand) current); } - public ZcodeSequencePath findNext() { + public ZscriptSequencePath findNext() { CommandSeqElement current = parent; CommandSeqElement prev = this; List markers = new ArrayList<>(); @@ -63,7 +63,7 @@ public ZcodeSequencePath findNext() { OrSeqElement orAncestor = (OrSeqElement) current; if (prev == orAncestor.before) { markers.add((byte) '|'); - return new ZcodeSequencePath(markers, findFirstCommand(orAncestor.after)); + return new ZscriptSequencePath(markers, findFirstCommand(orAncestor.after)); } } else if (current.getClass() == AndSeqElement.class) { AndSeqElement andAncestor = (AndSeqElement) current; @@ -72,7 +72,7 @@ public ZcodeSequencePath findNext() { if (prev.getClass() != OrSeqElement.class && next.getClass() != OrSeqElement.class) { markers.add((byte) '&'); } - return new ZcodeSequencePath(markers, findFirstCommand(next)); + return new ZscriptSequencePath(markers, findFirstCommand(next)); } } if (current.getClass() == OrSeqElement.class && current.getParent() != null && current.getParent().getClass() != OrSeqElement.class) { @@ -84,7 +84,7 @@ public ZcodeSequencePath findNext() { return null; } - public ZcodeSequencePath findFailPath() { + public ZscriptSequencePath findFailPath() { CommandSeqElement current = parent; CommandSeqElement prev = this; List markers = new ArrayList<>(); @@ -94,7 +94,7 @@ public ZcodeSequencePath findFailPath() { OrSeqElement orAncestor = (OrSeqElement) current; if (prev == orAncestor.before) { markers.add((byte) '|'); - return new ZcodeSequencePath(markers, findFirstCommand(orAncestor.after)); + return new ZscriptSequencePath(markers, findFirstCommand(orAncestor.after)); } } if (current.getClass() == OrSeqElement.class && current.getParent() != null && current.getParent().getClass() != OrSeqElement.class) { @@ -106,7 +106,7 @@ public ZcodeSequencePath findFailPath() { return null; } - public ZcodeSequencePath findSuccessPath() { + public ZscriptSequencePath findSuccessPath() { CommandSeqElement current = parent; CommandSeqElement prev = this; List markers = new ArrayList<>(); @@ -119,7 +119,7 @@ public ZcodeSequencePath findSuccessPath() { if (prev.getClass() != OrSeqElement.class && next.getClass() != OrSeqElement.class) { markers.add((byte) '&'); } - return new ZcodeSequencePath(markers, findFirstCommand(next)); + return new ZscriptSequencePath(markers, findFirstCommand(next)); } } if (current.getClass() == OrSeqElement.class && current.getParent() != null && current.getParent().getClass() != OrSeqElement.class) { diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptCommandBuilder.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptCommandBuilder.java similarity index 92% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptCommandBuilder.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptCommandBuilder.java index 0df1c2980..bc2617690 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptCommandBuilder.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptCommandBuilder.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.zcodeApi; +package net.zscript.javaclient.zscriptapi; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -10,10 +10,10 @@ public abstract class ZscriptCommandBuilder { private final List> listeners = new ArrayList<>(); - private final List bigFields = new ArrayList<>(); - private final Map fields = new HashMap<>(); + private final List bigFields = new ArrayList<>(); + private final Map fields = new HashMap<>(); - public class ZcodeBuiltCommand extends ZscriptCommand { + public class ZscriptBuiltCommand extends ZscriptCommand { @Override public CommandSeqElement reEvaluate() { @@ -112,9 +112,8 @@ public void write(ByteArrayOutputStream out) { private static byte toHex(int nibble) { if (nibble < 10) { return (byte) (nibble + '0'); - } else { - return (byte) (nibble + 'a' - 10); } + return (byte) (nibble + 'a' - 10); } public static byte[] writeField(byte f, int value) { @@ -123,9 +122,11 @@ public static byte[] writeField(byte f, int value) { } if (value == 0) { return new byte[] { f }; - } else if (value < 0x10) { + } + if (value < 0x10) { return new byte[] { f, toHex(value) }; - } else if (value < 0x100) { + } + if (value < 0x100) { return new byte[] { f, toHex(value >> 4), toHex(value & 0xF) }; } else if (value < 0x1000) { return new byte[] { f, toHex(value >> 8), toHex((value >> 4) & 0xF), toHex(value & 0xF) }; @@ -140,7 +141,7 @@ protected ZscriptCommandBuilder setField(char key, int value) { protected ZscriptCommandBuilder setField(byte key, int value) { if ((key & 0x80) != 0) { - throw new IllegalArgumentException("Key not a valid Zcode Command key"); + throw new IllegalArgumentException("Key not a valid Zscript Command key"); } fields.put(key, value); return this; @@ -178,6 +179,6 @@ public ZscriptCommandBuilder addResponseListener(ZscriptResponseListener l } public CommandSeqElement build() { - return new ZcodeBuiltCommand(); + return new ZscriptBuiltCommand(); } } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptResponse.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptResponse.java new file mode 100644 index 000000000..3b20a722b --- /dev/null +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptResponse.java @@ -0,0 +1,5 @@ +package net.zscript.javaclient.zscriptapi; + +public interface ZscriptResponse { + +} diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptResponseListener.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptResponseListener.java similarity index 92% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptResponseListener.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptResponseListener.java index 19728a59e..fe631f65f 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptResponseListener.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptResponseListener.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.zcodeApi; +package net.zscript.javaclient.zscriptapi; public interface ZscriptResponseListener { void accept(T resp); diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptUnparsedCommandResponse.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptUnparsedCommandResponse.java similarity index 99% rename from receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptUnparsedCommandResponse.java rename to receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptUnparsedCommandResponse.java index 2c3f323ff..2c280b15b 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zcodeApi/ZscriptUnparsedCommandResponse.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javaclient/zscriptapi/ZscriptUnparsedCommandResponse.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.zcodeApi; +package net.zscript.javaclient.zscriptapi; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptCommandOutStream.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptCommandOutStream.java index 75511fd88..2058c42c1 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptCommandOutStream.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptCommandOutStream.java @@ -3,7 +3,7 @@ import net.zscript.javareceiver.execution.ZscriptField; /** - * Defines the operations on the response OutStream available to a command via the ZcodeCommandContext. + * Defines the operations on the response OutStream available to a command via the CommandContext. */ public interface ZscriptCommandOutStream { diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptLocks.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptLocks.java index fd2f75139..3b5c2ae4c 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptLocks.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/core/ZscriptLocks.java @@ -2,7 +2,7 @@ public class ZscriptLocks { public static final int LOCK_BYTENUM = 32; - private final byte[] locks = new byte[LOCK_BYTENUM]; + private final byte[] locks = new byte[LOCK_BYTENUM]; public boolean lock(LockSet l) { if (!canLock(l)) { diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/execution/CommandContext.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/execution/CommandContext.java index a82bacb81..55e5d859b 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/execution/CommandContext.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/execution/CommandContext.java @@ -199,7 +199,7 @@ public void activate() { contextView.activate(); } - public Zscript getZcode() { + public Zscript getZscript() { return zscript; } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptCapabilitiesCommand.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptCapabilitiesCommand.java index ee2acd8d2..5d9dfcf0e 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptCapabilitiesCommand.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptCapabilitiesCommand.java @@ -27,8 +27,8 @@ private static int getVersion() { public String platformFirmwareStr = "Java JRE " + System.getProperty("java.runtime.version"); public int platformHardwareVersion = 0; public String platformHardwareStr = System.getProperty("os.arch") + " " + System.getProperty("os.name"); - public int coreZcodeVersion = 0; - public String coreZcodeStr = "Prototype parsing/running system for JVM"; + public int coreZscriptVersion = 0; + public String coreZscriptStr = "Prototype parsing/running system for JVM"; public void execute(CommandContext ctx) { ZscriptCommandOutStream out = ctx.getOutStream(); @@ -55,8 +55,8 @@ public void execute(CommandContext ctx) { ver = platformHardwareVersion; break; case 4: - str = coreZcodeStr; - ver = coreZcodeVersion; + str = coreZscriptStr; + ver = coreZscriptVersion; break; } if (str != null) { @@ -68,7 +68,7 @@ public void execute(CommandContext ctx) { ctx.status(ZscriptStatus.VALUE_OUT_OF_RANGE); } out.writeField('C', ZscriptCoreModule.getCommands()); - out.writeField('M', ctx.getZcode().getModuleRegistry().getCommandSwitchExistsBottom(0)); + out.writeField('M', ctx.getZscript().getModuleRegistry().getCommandSwitchExistsBottom(0)); } } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptChannelInfoCommand.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptChannelInfoCommand.java index 3d5e9cfc4..bbf31d4c6 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptChannelInfoCommand.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/core/ZscriptChannelInfoCommand.java @@ -9,7 +9,7 @@ public class ZscriptChannelInfoCommand { public static void execute(CommandContext ctx) { - List chs = ctx.getZcode().getChannels(); + List chs = ctx.getZscript().getChannels(); int current = ctx.getChannelIndex(); diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptChannelSetupCommand.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptChannelSetupCommand.java index c7c50096c..1ec3ed742 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptChannelSetupCommand.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptChannelSetupCommand.java @@ -9,7 +9,7 @@ public class ZscriptChannelSetupCommand { public static void execute(CommandContext ctx) { - List chs = ctx.getZcode().getChannels(); + List chs = ctx.getZscript().getChannels(); int current = ctx.getChannelIndex(); int target = ctx.getField((byte) 'C', current); @@ -19,7 +19,7 @@ public static void execute(CommandContext ctx) { } chs.get(target).channelSetup(ctx); if (ctx.hasField((byte) 'N')) { - ctx.getZcode().setNotificationOutStream(ctx.getZcode().getChannels().get(target).getOutStream(ctx.getZcode())); + ctx.getZscript().setNotificationOutStream(ctx.getZscript().getChannels().get(target).getOutStream(ctx.getZscript())); } } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptExtendedCapabilitiesCommand.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptExtendedCapabilitiesCommand.java index f6bce589d..839ff26ff 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptExtendedCapabilitiesCommand.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptExtendedCapabilitiesCommand.java @@ -11,7 +11,7 @@ public class ZscriptExtendedCapabilitiesCommand { public static void execute(CommandContext ctx) { ZscriptCommandOutStream out = ctx.getOutStream(); out.writeField('C', ZscriptOuterCoreModule.getCommands()); - out.writeField('M', ctx.getZcode().getModuleRegistry().getCommandSwitchExistsBroad()); + out.writeField('M', ctx.getZscript().getModuleRegistry().getCommandSwitchExistsBroad()); OptionalInt targetOpt = ctx.getField((byte) 'M'); if (targetOpt.isPresent()) { @@ -20,7 +20,7 @@ public static void execute(CommandContext ctx) { ctx.status(ZscriptStatus.VALUE_OUT_OF_RANGE); return; } - int result = ctx.getZcode().getModuleRegistry().getCommandSwitchExistsTop(target); + int result = ctx.getZscript().getModuleRegistry().getCommandSwitchExistsTop(target); out.writeField('L', result); } } diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptOuterCoreModule.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptOuterCoreModule.java index de02d6a84..5a4de879e 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptOuterCoreModule.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/modules/outerCore/ZscriptOuterCoreModule.java @@ -35,7 +35,7 @@ public void execute(CommandContext ctx, int command) { ZscriptExtendedCapabilitiesCommand.execute(ctx); break; case 0x4: - ((ZscriptCoreModule) ctx.getZcode().getModuleRegistry().getModule(0)).getGuidCmd().set(ctx); + ((ZscriptCoreModule) ctx.getZscript().getModuleRegistry().getModule(0)).getGuidCmd().set(ctx); break; case 0x8: ZscriptChannelSetupCommand.execute(ctx); diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/semanticParser/ParseState.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/semanticParser/ParseState.java index a978770d1..58cf2f2eb 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/semanticParser/ParseState.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/semanticParser/ParseState.java @@ -4,7 +4,7 @@ import net.zscript.javareceiver.semanticParser.SemanticAction.ActionType; /** - * Defines methods accessed by ZcodeActions. + * Defines methods accessed by ZscriptActions. */ public interface ParseState { byte getErrorStatus(); diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/TokenRingBuffer.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/TokenRingBuffer.java index e3a38efe9..e070f70a9 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/TokenRingBuffer.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/TokenRingBuffer.java @@ -5,7 +5,7 @@ /** * Ring-buffer implementation of a Token Buffer - a specific implementation of the ArrayBuffer. Additional rules are: *
    - *
  1. Maximum size is 64k bytes - Zcode isn't expected to work on huge datasets.
    2. + *
  2. Maximum size is 64k bytes - Zscript isn't expected to work on huge datasets.
    3. *
  3. All indices are incremented modulo the length of the underlying byte array.
    4. *
  4. *
@@ -13,7 +13,7 @@ */ public class TokenRingBuffer extends TokenArrayBuffer { /** - * Zcode shouldn't need huge buffers, so 64K is our extreme limit. It should be addressable by uint16 indexes. Note that *exact* 64K size implies that data.length cannot be + * Zscript shouldn't need huge buffers, so 64K is our extreme limit. It should be addressable by uint16 indexes. Note that *exact* 64K size implies that data.length cannot be * held in a uint16, so careful code required if porting! */ private static final int MAX_RING_BUFFER_SIZE = 0x1_0000; diff --git a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/Tokenizer.java b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/Tokenizer.java index 44f9ec31b..a4005671b 100644 --- a/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/Tokenizer.java +++ b/receivers/jvm/java-receiver-token/src/main/java/net/zscript/javareceiver/tokenizer/Tokenizer.java @@ -3,7 +3,7 @@ import net.zscript.javareceiver.tokenizer.TokenBuffer.TokenWriter; /** - * General Tokenizer for handling a stream of incoming Zcode bytes. Responsibilities: + * General Tokenizer for handling a stream of incoming Zscript bytes. Responsibilities: *
    *
  1. recording input into a Token Buffer
    2. *
  2. maintaining state at a Token level (eg are we in a string? hex nibbles? etc)
    3. @@ -15,8 +15,8 @@ *

    Token Buffer Overrun

    * * If incoming characters arrive faster than they can be processed, or command-sequences are so long that they threaten to overrun the token buffer storage, then the execution side - * is alerted by writing error tokens. There are two approaches to processing a byte of zcode input with respect to token buffer capacity, depending on whether the source of bytes - * is unbuffered or buffered. + * is alerted by writing error tokens. There are two approaches to processing a byte of zscript input with respect to token buffer capacity, depending on whether the source of + * bytes is unbuffered or buffered. * *

    Unbuffered Channels

    * @@ -37,7 +37,7 @@ * * If an incoming single command is too long for the buffer, then it will become OVERRUN no matter what. * - * @param b the new byte of zcode input + * @param b the new byte of zscript input */ public class Tokenizer { public static final byte ADDRESSING_FIELD_KEY = (byte) 0x80; @@ -124,9 +124,9 @@ public boolean offer(final byte b) { // TODO: Discuss dataLost changes. /** - * Process a byte of Zcode input into the parser. + * Process a byte of Zscript input into the parser. * - * @param b the new byte of zcode input + * @param b the new byte of zscript input */ public void accept(final byte b) { if (!isText && Zchars.shouldIgnore(b) || Zchars.alwaysIgnore(b)) { diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseParser/LocalZscriptConnection.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseparser/LocalZscriptConnection.java similarity index 96% rename from receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseParser/LocalZscriptConnection.java rename to receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseparser/LocalZscriptConnection.java index 33a156d0f..b130350a4 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseParser/LocalZscriptConnection.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseparser/LocalZscriptConnection.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.responseParser; +package net.zscript.javaclient.responseparser; import java.io.ByteArrayOutputStream; import java.util.ArrayDeque; @@ -7,7 +7,7 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; -import net.zscript.javaclient.responseParser.ZscriptConnection; +import net.zscript.javaclient.responseparser.ZscriptConnection; import net.zscript.javareceiver.core.OutputStreamOutStream; import net.zscript.javareceiver.core.Zscript; import net.zscript.javareceiver.core.ZscriptChannel; diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseParser/Main2.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseparser/Main2.java similarity index 50% rename from receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseParser/Main2.java rename to receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseparser/Main2.java index 28762131e..de786d241 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseParser/Main2.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/responseparser/Main2.java @@ -1,15 +1,12 @@ -package net.zscript.javaclient.responseParser; +package net.zscript.javaclient.responseparser; -import net.zscript.javaclient.responseParser.ZscriptAddress; -import net.zscript.javaclient.responseParser.CommandResponseQueue; -import net.zscript.javaclient.responseParser.CommandResponseSystem; -import net.zscript.javaclient.zcodeApiAttempt.DemoActivateCommandBuilder; -import net.zscript.javaclient.zcodeApiAttempt.DemoCapabilitiesCommandBuilder; +import net.zscript.javaclient.zscriptapiattempt.DemoActivateCommandBuilder; +import net.zscript.javaclient.zscriptapiattempt.DemoCapabilitiesCommandBuilder; public class Main2 { public static void main(String[] args) { - CommandResponseSystem zcodeOut = new CommandResponseQueue(new LocalZscriptConnection()); - zcodeOut.send(new DemoCapabilitiesCommandBuilder() + CommandResponseSystem zscriptOut = new CommandResponseQueue(new LocalZscriptConnection()); + zscriptOut.send(new DemoCapabilitiesCommandBuilder() .setVersionType(DemoCapabilitiesCommandBuilder.PLATFORM_FIRMWARE) .addResponseListener(r -> System.out.println(r.getName())) .build() @@ -19,9 +16,9 @@ public static void main(String[] args) { .andThen(new DemoActivateCommandBuilder() .addResponseListener(r -> System.out.println(r.alreadyActivated())) .build())); - CommandResponseSystem zcodeOutAddr = new CommandResponseQueue( - zcodeOut.getResponseAddressingSystem().getAddressConnection(ZscriptAddress.from(0x50, 0x0, 0x1))); - zcodeOutAddr.send(new DemoCapabilitiesCommandBuilder() + CommandResponseSystem zscriptOutAddr = new CommandResponseQueue( + zscriptOut.getResponseAddressingSystem().getAddressConnection(ZscriptAddress.from(0x50, 0x0, 0x1))); + zscriptOutAddr.send(new DemoCapabilitiesCommandBuilder() .setVersionType(DemoCapabilitiesCommandBuilder.PLATFORM_FIRMWARE) .addResponseListener(r -> System.out.println(r.getName())) .build()); diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/Demo.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/Demo.java similarity index 92% rename from receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/Demo.java rename to receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/Demo.java index b0a2fb66e..8c215d758 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/Demo.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/Demo.java @@ -1,4 +1,4 @@ -package net.zscript.javaclient.zcodeApiAttempt; +package net.zscript.javaclient.zscriptapiattempt; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/DemoActivateCommandBuilder.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/DemoActivateCommandBuilder.java similarity index 70% rename from receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/DemoActivateCommandBuilder.java rename to receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/DemoActivateCommandBuilder.java index 9769f2daa..fd6fe8422 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/DemoActivateCommandBuilder.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/DemoActivateCommandBuilder.java @@ -1,9 +1,9 @@ -package net.zscript.javaclient.zcodeApiAttempt; +package net.zscript.javaclient.zscriptapiattempt; -import net.zscript.javaclient.zcodeApi.ZscriptCommandBuilder; -import net.zscript.javaclient.zcodeApi.ZscriptResponse; -import net.zscript.javaclient.zcodeApi.ZscriptUnparsedCommandResponse; -import net.zscript.javaclient.zcodeApiAttempt.DemoActivateCommandBuilder.DemoActivateCommandResponse; +import net.zscript.javaclient.zscriptapi.ZscriptCommandBuilder; +import net.zscript.javaclient.zscriptapi.ZscriptResponse; +import net.zscript.javaclient.zscriptapi.ZscriptUnparsedCommandResponse; +import net.zscript.javaclient.zscriptapiattempt.DemoActivateCommandBuilder.DemoActivateCommandResponse; public class DemoActivateCommandBuilder extends ZscriptCommandBuilder { public class DemoActivateCommandResponse implements ZscriptResponse { diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/DemoCapabilitiesCommandBuilder.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/DemoCapabilitiesCommandBuilder.java similarity index 78% rename from receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/DemoCapabilitiesCommandBuilder.java rename to receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/DemoCapabilitiesCommandBuilder.java index 940e1b029..44dba918d 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zcodeApiAttempt/DemoCapabilitiesCommandBuilder.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javaclient/zscriptapiattempt/DemoCapabilitiesCommandBuilder.java @@ -1,16 +1,16 @@ -package net.zscript.javaclient.zcodeApiAttempt; +package net.zscript.javaclient.zscriptapiattempt; -import net.zscript.javaclient.zcodeApi.ZscriptCommandBuilder; -import net.zscript.javaclient.zcodeApi.ZscriptResponse; -import net.zscript.javaclient.zcodeApi.ZscriptUnparsedCommandResponse; -import net.zscript.javaclient.zcodeApiAttempt.DemoCapabilitiesCommandBuilder.DemoCapabilitiesCommandResponse; +import net.zscript.javaclient.zscriptapi.ZscriptCommandBuilder; +import net.zscript.javaclient.zscriptapi.ZscriptResponse; +import net.zscript.javaclient.zscriptapi.ZscriptUnparsedCommandResponse; +import net.zscript.javaclient.zscriptapiattempt.DemoCapabilitiesCommandBuilder.DemoCapabilitiesCommandResponse; public class DemoCapabilitiesCommandBuilder extends ZscriptCommandBuilder { public static final int USER_FIRMWARE = 0; public static final int USER_HARDWARE = 1; public static final int PLATFORM_FIRMWARE = 2; public static final int PLATFORM_HARDWARE = 3; - public static final int CORE_ZCODE = 4; + public static final int CORE_ZSCRIPT = 4; private int infoType = USER_FIRMWARE; diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/AbstractOutStreamTest.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/AbstractOutStreamTest.java index 9d46667f0..5bb77e35c 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/AbstractOutStreamTest.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/AbstractOutStreamTest.java @@ -129,7 +129,7 @@ void shouldWriteStringFieldWithString() { @Test - void shouldWriteZcodeField() { + void shouldWriteZscriptField() { // This is really hard/annoying to test, and it's only used in the echo command. But we want to test it - we just had a stupid bug in it. Let's just write comprehensive parser tests around this. } diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/OutputStreamOutStream.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/OutputStreamOutStream.java index 88a619c9b..d91bbc038 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/OutputStreamOutStream.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/OutputStreamOutStream.java @@ -4,10 +4,8 @@ import java.io.OutputStream; import java.io.UncheckedIOException; -import net.zscript.javareceiver.core.AbstractOutStream; - /** - * Utility class for helping tests: ZcodeAbstractOutStream implementation that collects bytes + * Utility class for helping tests: AbstractOutStream implementation that collects bytes */ public class OutputStreamOutStream extends AbstractOutStream { private final Z output; diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/StringWriterOutStream.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/StringWriterOutStream.java index 2ab6cf9ab..999b1565a 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/StringWriterOutStream.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/core/StringWriterOutStream.java @@ -7,7 +7,7 @@ import org.apache.commons.io.output.WriterOutputStream; /** - * Utility class for helping tests: ZcodeAbstractOutStream implementation that collects bytes + * Utility class for helping tests: AbstractOutStream implementation that collects bytes */ public class StringWriterOutStream extends OutputStreamOutStream { private final StringWriter stringWriter; diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/semanticParser/SemanticParserTest.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/semanticParser/SemanticParserTest.java index 0dba6a351..5c092da7b 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/semanticParser/SemanticParserTest.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/semanticParser/SemanticParserTest.java @@ -21,11 +21,8 @@ import net.zscript.javareceiver.core.StringWriterOutStream; import net.zscript.javareceiver.core.Zscript; import net.zscript.javareceiver.modules.core.ZscriptCoreModule; -import net.zscript.javareceiver.semanticParser.ExecutionActionFactory; -import net.zscript.javareceiver.semanticParser.SemanticParser; -import net.zscript.javareceiver.semanticParser.SemanticAction; -import net.zscript.javareceiver.semanticParser.SemanticParser.State; import net.zscript.javareceiver.semanticParser.SemanticAction.ActionType; +import net.zscript.javareceiver.semanticParser.SemanticParser.State; import net.zscript.javareceiver.tokenizer.TokenBuffer; import net.zscript.javareceiver.tokenizer.TokenRingBuffer; import net.zscript.javareceiver.tokenizer.Tokenizer; @@ -95,7 +92,7 @@ void shouldProduceActionForTwoCommands() { final SemanticAction a2 = parser.getAction(); assertThat(a2.getType()).isEqualTo(RUN_COMMAND); -// assertThat(a2.getInfo()).isEqualTo(ZcodeTokenizer.CMD_END_ANDTHEN); +// assertThat(a2.getInfo()).isEqualTo(ZscriptTokenizer.CMD_END_ANDTHEN); a2.performAction(zscript, outStream); assertThat(outStream.getStringAndReset()).isEqualTo("&BS"); assertThat(parser.getState()).isEqualTo(State.COMMAND_COMPLETE); diff --git a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/tokenizer/TokenizerTest.java b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/tokenizer/TokenizerTest.java index ef37d246e..7fe7c5086 100644 --- a/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/tokenizer/TokenizerTest.java +++ b/receivers/jvm/java-receiver-token/src/test/java/net/zscript/javareceiver/tokenizer/TokenizerTest.java @@ -21,10 +21,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import net.zscript.javareceiver.tokenizer.Zchars; -import net.zscript.javareceiver.tokenizer.TokenBuffer; -import net.zscript.javareceiver.tokenizer.Tokenizer; - @ExtendWith(MockitoExtension.class) class TokenizerTest { @Mock @@ -63,8 +59,8 @@ void shouldMarkOverrunOnDataLostOnce() { @ParameterizedTest(name = "{0}: {1}") @MethodSource - public void shouldHandleSimpleNumericFields(String desc, String zcode, String bufferActions) { - validateZcodeActions(zcode, bufferActions); + public void shouldHandleSimpleNumericFields(String desc, String zscript, String bufferActions) { + validateZscriptActions(zscript, bufferActions); } private static Stream shouldHandleSimpleNumericFields() { @@ -83,9 +79,9 @@ private static Stream shouldHandleSimpleNumericFields() { @ParameterizedTest(name = "{0}: {1}") @MethodSource - public void shouldRejectInvalidKeys(String desc, String zcode, String bufferActions) { + public void shouldRejectInvalidKeys(String desc, String zscript, String bufferActions) { when(writer.isTokenComplete()).thenReturn(true, false, true, false, true); - validateZcodeActions(zcode, bufferActions); + validateZscriptActions(zscript, bufferActions); } private static Stream shouldRejectInvalidKeys() { @@ -102,8 +98,8 @@ private static Stream shouldRejectInvalidKeys() { @ParameterizedTest(name = "{0}: {1}") @MethodSource - public void shouldHandleLogicalSequencesOfNumericFields(String desc, String zcode, String bufferActions) { - validateZcodeActions(zcode, bufferActions); + public void shouldHandleLogicalSequencesOfNumericFields(String desc, String zscript, String bufferActions) { + validateZscriptActions(zscript, bufferActions); } private static Stream shouldHandleLogicalSequencesOfNumericFields() { @@ -118,8 +114,8 @@ private static Stream shouldHandleLogicalSequencesOfNumericFields() { @ParameterizedTest(name = "{0}: {1}") @MethodSource - public void shouldHandleBigFields(String desc, String zcode, String bufferActions) { - validateZcodeActions(zcode, bufferActions); + public void shouldHandleBigFields(String desc, String zscript, String bufferActions) { + validateZscriptActions(zscript, bufferActions); } private static Stream shouldHandleBigFields() { @@ -135,8 +131,8 @@ private static Stream shouldHandleBigFields() { @ParameterizedTest(name = "{0}: {1}") @MethodSource - public void shouldHandleComment(String desc, String zcode, String bufferActions) { - validateZcodeActions(zcode, bufferActions); + public void shouldHandleComment(String desc, String zscript, String bufferActions) { + validateZscriptActions(zscript, bufferActions); } private static Stream shouldHandleComment() { @@ -147,8 +143,8 @@ private static Stream shouldHandleComment() { @ParameterizedTest(name = "{0}: {1}") @MethodSource - public void shouldHandleAddressing(String desc, String zcode, String bufferActions) { - validateZcodeActions(zcode, bufferActions); + public void shouldHandleAddressing(String desc, String zscript, String bufferActions) { + validateZscriptActions(zscript, bufferActions); } private static Stream shouldHandleAddressing() { @@ -163,15 +159,15 @@ private static Stream shouldHandleAddressing() { /** * Simple way to test lots of possibilities: bufferActions is a little 2-char language describing, for each input char, the (op, arg) on the buffer. * - * @param zcode some zcode text to tokenize, but where 'n' is replaced by '\n' - * @param bufferActions a pair of chars for each zcode char, so express expected method calls + * @param zscript some zscript text to tokenize, but where 'n' is replaced by '\n' + * @param bufferActions a pair of chars for each zscript char, so express expected method calls */ - private void validateZcodeActions(String zcode, String bufferActions) { - if (zcode.length() * 2 > bufferActions.length()) { - fail("bufferActions length is too short (trimmed?) + zcode='" + zcode + "', actions='" + bufferActions + "'"); + private void validateZscriptActions(String zscript, String bufferActions) { + if (zscript.length() * 2 > bufferActions.length()) { + fail("bufferActions length is too short (trimmed?) + zscript='" + zscript + "', actions='" + bufferActions + "'"); } int index = 0; - for (byte c : zcode.getBytes()) { + for (byte c : zscript.getBytes()) { tokenizer.accept(c); // System.out.println("c = " + c); char action = bufferActions.charAt(index * 2); @@ -219,7 +215,7 @@ private void validateZcodeActions(String zcode, String bufferActions) { @Test public void shouldAcceptSingleKeyAtTokenStart() { when(writer.isTokenComplete()).thenReturn(true); - validateZcodeActions("Z\n", "tZm" + END); + validateZscriptActions("Z\n", "tZm" + END); } // Expected pattern of length/inNibble for successive nibbles @@ -233,21 +229,21 @@ public void shouldAcceptSingleKeyAtTokenStart() { public void shouldFailOnLongNumber() { when(writer.getCurrentWriteTokenLength()).thenReturn(0).thenReturn(1).thenReturn(1).thenReturn(2).thenReturn(2).thenThrow(RuntimeException.class); when(writer.isInNibble()).thenReturn(true).thenReturn(false).thenThrow(RuntimeException.class); - validateZcodeActions("Z12345\n\n", "tZn1n2n3n4f" + (char) Tokenizer.ERROR_CODE_FIELD_TOO_LONG + "--m"+END + "--"); + validateZscriptActions("Z12345\n\n", "tZn1n2n3n4f" + (char) Tokenizer.ERROR_CODE_FIELD_TOO_LONG + "--m"+END + "--"); } @Test public void shouldFailOnOddHexString() { when(writer.getCurrentWriteTokenKey()).thenReturn(Zchars.Z_BIGFIELD_HEX); when(writer.isInNibble()).thenReturn(false) .thenReturn(true).thenReturn(false).thenReturn(true).thenThrow(RuntimeException.class); - validateZcodeActions("+123A\nB\n", "s+n1n2n3f" + (char) Tokenizer.ERROR_CODE_ODD_BIGFIELD_LENGTH + "--tBm" + END + "--"); + validateZscriptActions("+123A\nB\n", "s+n1n2n3f" + (char) Tokenizer.ERROR_CODE_ODD_BIGFIELD_LENGTH + "--tBm" + END + "--"); } @Test public void shouldFailOnOddHexStringTerminatedByNL() { when(writer.getCurrentWriteTokenKey()).thenReturn(Zchars.Z_BIGFIELD_HEX); when(writer.isInNibble()).thenReturn(false) .thenReturn(true).thenReturn(false).thenReturn(true).thenThrow(RuntimeException.class); - validateZcodeActions("+12abc\nA\n", "s+n1n2nanbncf" + (char) Tokenizer.ERROR_CODE_ODD_BIGFIELD_LENGTH + "tAm" + END + "--"); + validateZscriptActions("+12abc\nA\n", "s+n1n2nanbncf" + (char) Tokenizer.ERROR_CODE_ODD_BIGFIELD_LENGTH + "tAm" + END + "--"); } }