From f2037af115d8459aeaed003bb7c4aa0557a040b9 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Wed, 25 Oct 2023 19:33:51 -0400 Subject: Tweak --- .../bjc/pratt/commands/BranchInitialCommand.java | 38 ++++++++++++++++++++++ .../java/bjc/pratt/commands/CommandResult.java | 15 +++++++++ .../bjc/pratt/commands/impls/InitialCommands.java | 29 ++++++++++++++++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 JPratt/src/main/java/bjc/pratt/commands/BranchInitialCommand.java (limited to 'JPratt/src/main/java/bjc/pratt/commands') diff --git a/JPratt/src/main/java/bjc/pratt/commands/BranchInitialCommand.java b/JPratt/src/main/java/bjc/pratt/commands/BranchInitialCommand.java new file mode 100644 index 0000000..3f3093e --- /dev/null +++ b/JPratt/src/main/java/bjc/pratt/commands/BranchInitialCommand.java @@ -0,0 +1,38 @@ +package bjc.pratt.commands; + +import java.util.Map; + +import bjc.pratt.ParserContext; +import bjc.pratt.tokens.Token; +import bjc.utils.parserutils.ParserException; + +/** + * Represents a initial command that has a number of 'sub-commands' in the way that Go/Git CLI does. + * + * @author bjcul + * + * @param Token key type + * @param Token value type + * @param Parser context type + */ +public class BranchInitialCommand implements InitialCommand { + private Map> comMap; + + /** + * Create a new branch initial command + * + * @param mep The map containing the commands + */ + public BranchInitialCommand(Map> mep) { + this.comMap = mep; + } + + @Override + public CommandResult denote(Token operator, ParserContext ctx) throws ParserException { + Token curToken = ctx.tokens.current(); + ctx.tokens.expect(comMap.keySet()); + + return comMap.get(curToken.getKey()).denote(curToken, ctx); + } + +} diff --git a/JPratt/src/main/java/bjc/pratt/commands/CommandResult.java b/JPratt/src/main/java/bjc/pratt/commands/CommandResult.java index d27400f..38a55ae 100644 --- a/JPratt/src/main/java/bjc/pratt/commands/CommandResult.java +++ b/JPratt/src/main/java/bjc/pratt/commands/CommandResult.java @@ -94,4 +94,19 @@ public class CommandResult { CommandResult result = new CommandResult<>(Status.BACKTRACK); return result; } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("CommandResult [status="); + builder.append(status); + if (status == Status.SUCCESS) { + builder.append(", success="); + builder.append(success); + } + builder.append("]"); + return builder.toString(); + } + + } diff --git a/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java b/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java index bfc4e4f..6af6954 100644 --- a/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java +++ b/JPratt/src/main/java/bjc/pratt/commands/impls/InitialCommands.java @@ -7,9 +7,10 @@ import static bjc.pratt.blocks.ParseBlocks.trigger; import java.util.function.UnaryOperator; import bjc.pratt.blocks.ParseBlock; -import bjc.pratt.commands.InitialCommand; +import bjc.pratt.commands.*; import bjc.pratt.tokens.Token; import bjc.data.Tree; +import bjc.functypes.MapBuilder; /** * * Contains factory methods for producing common implementations of @@ -211,4 +212,30 @@ public class InitialCommands { public static InitialCommand panfix(final int precedence, final K term, final Token marker) { return new PanfixCommand<>(marker, term, precedence); } + + /** + * Create a command that unconditionally returns a failure result. + * + * @param Token key type + * @param Token value type + * @param Context type + * + * @return A command that unconditionally fails + */ + public static InitialCommand fail() { + return (operator, ctx) -> CommandResult.fail(); + } + + /** + * Create a new builder for branching/sub-command style commands. + * + * @param Token key type + * @param Value key type + * @param Context type + * + * @return A builder for branching/sub-command style commands + */ + public static MapBuilder, InitialCommand> branch() { + return MapBuilder.from(BranchInitialCommand::new); + } } \ No newline at end of file -- cgit v1.2.3