mirror of
https://github.com/Smaug123/WoofWare.Myriad
synced 2025-10-13 07:58:40 +00:00
Fix all but the help text
This commit is contained in:
Smaug123
File diff suppressed because it is too large
Load Diff
@@ -79,11 +79,8 @@ module TestArgParser =
|
||||
|
||||
exc.Message
|
||||
|> shouldEqual
|
||||
"""Parse error: The following arguments were not consumed: --non-existent. to process supplied arg --non-existent. Help text follows.
|
||||
--foo int32 : This is a foo!
|
||||
--bar string
|
||||
--baz bool
|
||||
--rest string (positional args) (can be repeated) : Here's where the rest of the args go"""
|
||||
"""Errors during parse!
|
||||
Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--my-arg-name=` syntax, or place them after a trailing `--`. --non-existent"""
|
||||
|
||||
[<Test>]
|
||||
let ``Can supply positional args with key`` () =
|
||||
@@ -693,7 +690,9 @@ Required argument '--turn-it-on' received no value"""
|
||||
)
|
||||
|
||||
exc.Message
|
||||
|> shouldEqual """Parse error: The following positional arguments were not consumed: --b=false --c hi --help"""
|
||||
|> shouldEqual
|
||||
"""Errors during parse!
|
||||
Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--my-arg-name=` syntax, or place them after a trailing `--`. --b=false --c"""
|
||||
|
||||
let exc =
|
||||
Assert.Throws<exn> (fun () ->
|
||||
@@ -704,4 +703,6 @@ Required argument '--turn-it-on' received no value"""
|
||||
// Again perhaps eccentric!
|
||||
// Again, we don't try to detect that the user has missed out the desired argument to `--a`.
|
||||
exc.Message
|
||||
|> shouldEqual """Parse error: The following arguments were not consumed: --c=hi"""
|
||||
|> shouldEqual
|
||||
"""Errors during parse!
|
||||
Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--my-arg-name=` syntax, or place them after a trailing `--`. --c=hi"""
|
||||
|
||||
@@ -84,6 +84,17 @@ module internal ShibaGenerator =
|
||||
|
||||
result.ToString().TrimStart '-'
|
||||
|
||||
/// Expects `e` to be a string; calls `e.StartsWith("--", StringComparison.Ordinal)`.
|
||||
let startsWithDashes (e : SynExpr) : SynExpr =
|
||||
e
|
||||
|> SynExpr.callMethodArg
|
||||
"StartsWith"
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.CreateConst "--"
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "Ordinal" ]
|
||||
])
|
||||
|
||||
type LeafData<'choice> =
|
||||
{
|
||||
/// Call this function to turn the input into the `TypeAfterParse`.
|
||||
@@ -936,21 +947,33 @@ module internal ShibaGenerator =
|
||||
match leaf.Positional with
|
||||
// TODO: account for includeFlagLike
|
||||
| Some includeFlagLike ->
|
||||
[
|
||||
SynExpr.callMethodArg
|
||||
"Add"
|
||||
leaf.HumanReadableArgForm
|
||||
(SynExpr.createIdent "positionalConsumers")
|
||||
// Positional args carried in from external argument.
|
||||
// TODO: register whether they came before or after separator
|
||||
let constructPositionalsList =
|
||||
match leaf.Acc with
|
||||
| List acc ->
|
||||
match acc with
|
||||
| Accumulation.List _ ->
|
||||
failwith "unexpected: positional args should not be a list of lists"
|
||||
| Accumulation.Required ->
|
||||
// TODO: we need to preserve the ordering on these with respect to
|
||||
// the explicitly passed `--foo=` positionals
|
||||
// The condition that determines whether this looks like a flag that's mistakenly
|
||||
// a conditional, which we should reject
|
||||
let rejectFlagInPositional =
|
||||
let includeFlagLike =
|
||||
match includeFlagLike with
|
||||
| None -> SynExpr.CreateConst false
|
||||
| Some i -> i
|
||||
|
||||
SynExpr.booleanAnd
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "not")
|
||||
(SynExpr.paren includeFlagLike))
|
||||
(startsWithDashes (
|
||||
SynExpr.paren (
|
||||
SynExpr.applyFunction
|
||||
(SynExpr.createIdent "fst")
|
||||
(SynExpr.createIdent "x")
|
||||
)
|
||||
))
|
||||
|
||||
SynExpr.createIdent "positionals"
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.applyFunction
|
||||
@@ -964,7 +987,21 @@ module internal ShibaGenerator =
|
||||
(SynPat.identWithArgs
|
||||
[ Ident.create "Choice1Of2" ]
|
||||
(SynArgPats.createNamed [ "x" ]))
|
||||
(SynExpr.createIdent "x")
|
||||
(SynExpr.ifThenElse
|
||||
rejectFlagInPositional
|
||||
(SynExpr.createIdent "x")
|
||||
(SynExpr.sequential
|
||||
[
|
||||
SynExpr.callMethodArg
|
||||
"Add"
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.createIdent "fst")
|
||||
(SynExpr.createIdent "x")
|
||||
|> SynExpr.paren)
|
||||
(SynExpr.createIdent
|
||||
"outOfPlacePositionals")
|
||||
(SynExpr.createIdent "x")
|
||||
]))
|
||||
SynMatchClause.create
|
||||
(SynPat.identWithArgs
|
||||
[ Ident.create "Choice2Of2" ]
|
||||
@@ -1068,6 +1105,15 @@ module internal ShibaGenerator =
|
||||
|> SynExpr.applyFunction (SynExpr.createLongIdent [ "List" ; "map" ])
|
||||
)
|
||||
| _ -> failwith "unexpected: positional arguments should be a list"
|
||||
|
||||
[
|
||||
SynExpr.callMethodArg
|
||||
"Add"
|
||||
leaf.HumanReadableArgForm
|
||||
(SynExpr.createIdent "positionalConsumers")
|
||||
// If any of the Choice1Of2 positional args look like flags,
|
||||
// and `not includeFlagLike`, then store a parse error.
|
||||
[ constructPositionalsList ] |> SynExpr.sequential
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
| None ->
|
||||
@@ -1179,7 +1225,36 @@ module internal ShibaGenerator =
|
||||
|> List.singleton
|
||||
)
|
||||
|
||||
instantiation
|
||||
[
|
||||
SynExpr.createIdent "outOfPlacePositionals"
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLongIdent [ "String" ; "concat" ]
|
||||
|> SynExpr.applyTo (SynExpr.CreateConst " ")
|
||||
)
|
||||
|> SynExpr.pipeThroughFunction (
|
||||
SynExpr.createLambda
|
||||
"x"
|
||||
(SynExpr.plus
|
||||
// TODO: if we have a positional consumer, point this out, but otherwise don't
|
||||
// TODO: print the help text here
|
||||
(SynExpr.CreateConst
|
||||
"Unmatched args which look like they are meant to be flags. If you intended them as positional args, explicitly pass them with the `--my-arg-name=` syntax, or place them after a trailing `--`. ")
|
||||
(SynExpr.createIdent "x"))
|
||||
)
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "errors" ; "Add" ])
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.dotGet "Count" (SynExpr.createIdent "outOfPlacePositionals")
|
||||
|> SynExpr.greaterThan (SynExpr.CreateConst 0))
|
||||
(SynExpr.CreateConst ())
|
||||
|
||||
instantiation
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.equals (SynExpr.dotGet "Count" (SynExpr.createIdent "errors")) (SynExpr.CreateConst 0))
|
||||
(SynExpr.createIdent "errors"
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Seq" ; "toList" ])
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
|
||||
]
|
||||
|> SynExpr.sequential
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.lessThanOrEqual
|
||||
(SynExpr.CreateConst 1)
|
||||
@@ -1188,15 +1263,13 @@ module internal ShibaGenerator =
|
||||
|> SynExpr.applyFunction (
|
||||
SynExpr.applyFunction (SynExpr.createLongIdent [ "String" ; "concat" ]) (SynExpr.CreateConst ", ")
|
||||
)
|
||||
|> SynExpr.plus (SynExpr.CreateConst "Multiple parsers consumed positional args: ")
|
||||
|> SynExpr.plus (
|
||||
SynExpr.CreateConst
|
||||
"Multiple parsers consumed positional args; this is an error in the application, not an error by the user: "
|
||||
)
|
||||
|> SynExpr.paren
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "List" ; "singleton" ])
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
|
||||
|> SynExpr.ifThenElse
|
||||
(SynExpr.equals (SynExpr.dotGet "Count" (SynExpr.createIdent "errors")) (SynExpr.CreateConst 0))
|
||||
(SynExpr.createIdent "errors"
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createLongIdent [ "Seq" ; "toList" ])
|
||||
|> SynExpr.pipeThroughFunction (SynExpr.createIdent "Error"))
|
||||
|> SynExpr.createLet assignVariables
|
||||
|> SynExpr.createLet
|
||||
[
|
||||
@@ -1212,6 +1285,13 @@ module internal ShibaGenerator =
|
||||
(SynExpr.applyFunction
|
||||
(SynExpr.typeApp [ SynType.string ] (SynExpr.createIdent "ResizeArray"))
|
||||
(SynExpr.CreateConst ()))
|
||||
// TODO: we can optimise this away if we know already we're accepting all positionals,
|
||||
// although we can only guess this with heuristics in the generator
|
||||
SynBinding.basic
|
||||
[ Ident.create "outOfPlacePositionals" ]
|
||||
[]
|
||||
(SynExpr.applyFunction (SynExpr.createIdent "ResizeArray") (SynExpr.CreateConst ()))
|
||||
|> SynBinding.withReturnAnnotation (SynType.app "ResizeArray" [ SynType.string ])
|
||||
]
|
||||
|> SynBinding.basic
|
||||
[ Ident.create "this" ; Ident.create "Assemble_" ]
|
||||
@@ -1765,15 +1845,7 @@ module internal ShibaGenerator =
|
||||
|
||||
handleFailure
|
||||
|
||||
let argStartsWithDashes =
|
||||
SynExpr.createIdent "arg"
|
||||
|> SynExpr.callMethodArg
|
||||
"StartsWith"
|
||||
(SynExpr.tuple
|
||||
[
|
||||
SynExpr.CreateConst "--"
|
||||
SynExpr.createLongIdent [ "System" ; "StringComparison" ; "Ordinal" ]
|
||||
])
|
||||
let argStartsWithDashes = startsWithDashes (SynExpr.createIdent "arg")
|
||||
|
||||
let processKey =
|
||||
SynExpr.ifThenElse
|
||||
|
||||
Reference in New Issue
Block a user