command-line.parser: adding test for cannot-convert-value

mrjbq7 · May 22, 2024 · dbf4630 · dbf4630
1 parent 7a443df
commit dbf4630
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/extra/command-line/parser/parser-tests.factor b/extra/command-line/parser/parser-tests.factor
@@ -5,6 +5,13 @@ math.parser namespaces sequences tools.test ;
 
 IN: command-line.parser.tests
 
+TUPLE: foo ;
+
+[
+    { T{ option { name "--foo" } { type foo } } }
+    { "--foo" "abcd" } (parse-options)
+] [ cannot-convert-value? ] must-fail-with
+
 [
     { T{ option { name "--foo" } { required? t } } }
     { } (parse-options)

diff --git a/extra/command-line/parser/parser.factor b/extra/command-line/parser/parser.factor
@@ -32,9 +32,8 @@ TUPLE: option name type help variable default convert validate
 
 : option-name ( option -- name )
     {
-        [ name>> [ CHAR: - = ] trim-head ]
-        [ variable>> dup string? [ name>> ] unless ]
-    } 1|| ;
+        [ name>> ] [ variable>> dup string? [ name>> ] unless ]
+    } 1|| [ CHAR: - = ] trim-head ;
 
 :: option-#args ( option -- #args )
     option #args>> [ option const>> 1 xor ] unless* ;
@@ -107,6 +106,7 @@ M: cannot-convert-value error.
     dup quotation? [ call( str -- val ) ] [
         {
             { f [ ] }
+            { string [ ] }
             { object [ [ 1array <lexer> [ scan-object ] with-lexer ] with-manifest ] }
             { boolean [ {
                     { [ dup >lower { "t" "true" "1" "on" "y" "yes" } member? ] [ drop t ] }