1 files changed, 22 insertions, 1 deletions

diff --git a/shell/shell.c b/shell/shell.c
index 24ae243..42b3ccd 100644
--- a/shell/shell.c
+++ b/shell/shell.c
@@ -67,6 +67,7 @@ static int64_t datasize_exec(args_t *);
 static int64_t gendata_exec(args_t *);
 static int64_t solve_exec(args_t *);
 static int64_t solve_scramble_exec(args_t *);
+static int64_t countmoves_exec(args_t *);
 static int64_t help_exec(args_t *);
 
 static int parse_args(int, char **, args_t *);
@@ -202,13 +203,20 @@ struct {
                 "solve_scramble",
                 "solve_scramble " FLAG_SOLVER " SOLVER"
                 "[" FLAG_MINMOVES " n] [" FLAG_MAXMOVES " N] "
-                FLAG_CUBE " CUBE",
+                FLAG_MOVES " MOVES",
                 "Solve the given SCRAMBLE using SOLVER, "
                 "using at least n and at most N moves. "
                 INFO_MOVESFORMAT,
                 solve_scramble_exec
         ),
         COMMAND(
+                "countmoves",
+                "countmoves " FLAG_MOVES " MOVES",
+                "Count the given MOVES in HTM. "
+                INFO_MOVESFORMAT,
+                countmoves_exec
+        ),
+        COMMAND(
                 "help",
                 "help [" FLAG_COMMAND " COMMAND]",
                 "If no COMMAND is specified, prints some generic information "
@@ -488,6 +496,19 @@ solve_scramble_exec(args_t *args)
 }
 
 static int64_t
+countmoves_exec(args_t *args)
+{
+        long long count;
+
+        count = nissy_countmoves(args->str_moves);
+
+        if (count >= 0)
+                printf("%lld\n", count);
+
+        return count >= 0 ? 0 : count;
+}
+
+static int64_t
 help_exec(args_t *args)
 {
         int i;