Skip to content

Commit c40eb30

Browse files
Smaug123claude
Smaug123
and
claude
committed
Add a checked WellFormedSchema constructor to the runtime kernel
The selection semantics assume every addressable --token names at most one claimant under the scanner's case-insensitive matching; without that, matchLeaf silently routes colliding tokens to the first-declared leaf. Generation-time checks cannot see forms supplied via [<Literal>] constants, so generated code will re-check at runtime via WellFormedSchema.checkOrFail before parsing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
1 parent dd0e64f commit c40eb30

22 files changed

Lines changed: 26277 additions & 29034 deletions

‎ConsumePlugin/Generated2SwaggerGitea.fs‎

Lines changed: 18217 additions & 20404 deletions
Large diffs are not rendered by default.

‎ConsumePlugin/GeneratedArgParserNegationTests.fs‎

Lines changed: 158 additions & 183 deletions
Large diffs are not rendered by default.

‎ConsumePlugin/GeneratedArgs.fs‎

Lines changed: 873 additions & 1010 deletions
Large diffs are not rendered by default.

‎ConsumePlugin/GeneratedCapturingMock.fs‎

Lines changed: 247 additions & 389 deletions
Large diffs are not rendered by default.

‎ConsumePlugin/GeneratedCapturingMockNoAttributes.fs‎

Lines changed: 190 additions & 309 deletions
Large diffs are not rendered by default.

‎ConsumePlugin/GeneratedCatamorphism.fs‎

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@ open WoofWare.Myriad.Plugins
1515
/// Description of how to combine cases during a fold
1616
type TreeBuilderCataCase<'b, 'a, 'TreeBuilder, 'Tree> =
1717
/// How to operate on the Child case
18-
abstract Child : 'TreeBuilder -> 'TreeBuilder
18+
abstract Child: 'TreeBuilder -> 'TreeBuilder
1919
/// How to operate on the Parent case
20-
abstract Parent : 'Tree -> 'TreeBuilder
20+
abstract Parent: 'Tree -> 'TreeBuilder
2121

2222
/// Description of how to combine cases during a fold
2323
type TreeCataCase<'a, 'b, 'TreeBuilder, 'Tree> =
2424
/// How to operate on the Const case
25-
abstract Const : Const<'a> -> 'b -> 'Tree
25+
abstract Const: Const<'a> -> 'b -> 'Tree
2626
/// How to operate on the Pair case
27-
abstract Pair : 'Tree -> 'Tree -> PairOpKind -> 'Tree
27+
abstract Pair: 'Tree -> 'Tree -> PairOpKind -> 'Tree
2828
/// How to operate on the Sequential case
29-
abstract Sequential : 'Tree list -> 'Tree
29+
abstract Sequential: 'Tree list -> 'Tree
3030
/// How to operate on the Builder case
31-
abstract Builder : 'Tree -> 'TreeBuilder -> 'Tree
31+
abstract Builder: 'Tree -> 'TreeBuilder -> 'Tree
3232

3333
/// Specifies how to perform a fold (catamorphism) over the type Tree and its friends.
3434
type TreeCata<'b, 'a, 'TreeBuilder, 'Tree> =
3535
{
3636
/// How to perform a fold (catamorphism) over the type TreeBuilder
37-
TreeBuilder : TreeBuilderCataCase<'b, 'a, 'TreeBuilder, 'Tree>
37+
TreeBuilder: TreeBuilderCataCase<'b, 'a, 'TreeBuilder, 'Tree>
3838
/// How to perform a fold (catamorphism) over the type Tree
39-
Tree : TreeCataCase<'a, 'b, 'TreeBuilder, 'Tree>
39+
Tree: TreeCataCase<'a, 'b, 'TreeBuilder, 'Tree>
4040
}
4141

4242
/// Methods to perform a catamorphism over the type Tree
@@ -52,52 +52,52 @@ module TreeCata =
5252
| Tree_Sequential of int
5353
| Tree_Builder
5454

55-
let private loop (cata : TreeCata<'b, 'a, 'TreeBuilder, 'Tree>) (instructions : ResizeArray<Instruction<'b, 'a>>) =
56-
let treeStack = ResizeArray<'Tree> ()
57-
let treeBuilderStack = ResizeArray<'TreeBuilder> ()
55+
let private loop (cata: TreeCata<'b, 'a, 'TreeBuilder, 'Tree>) (instructions: ResizeArray<Instruction<'b, 'a>>) =
56+
let treeStack = ResizeArray<'Tree>()
57+
let treeBuilderStack = ResizeArray<'TreeBuilder>()
5858

5959
while instructions.Count > 0 do
6060
let currentInstruction = instructions.[instructions.Count - 1]
61-
instructions.RemoveAt (instructions.Count - 1)
61+
instructions.RemoveAt(instructions.Count - 1)
6262

6363
match currentInstruction with
6464
| Instruction.Process__TreeBuilder x ->
6565
match x with
66-
| TreeBuilder.Child (arg0_0) ->
66+
| TreeBuilder.Child(arg0_0) ->
6767
instructions.Add Instruction.TreeBuilder_Child
68-
instructions.Add (Instruction.Process__TreeBuilder arg0_0)
69-
| TreeBuilder.Parent (arg0_0) ->
68+
instructions.Add(Instruction.Process__TreeBuilder arg0_0)
69+
| TreeBuilder.Parent(arg0_0) ->
7070
instructions.Add Instruction.TreeBuilder_Parent
71-
instructions.Add (Instruction.Process__Tree arg0_0)
71+
instructions.Add(Instruction.Process__Tree arg0_0)
7272
| Instruction.Process__Tree x ->
7373
match x with
74-
| Tree.Const (arg0_0, arg1_0) -> cata.Tree.Const arg0_0 arg1_0 |> treeStack.Add
75-
| Tree.Pair (arg0_0, arg1_0, arg2_0) ->
76-
instructions.Add (Instruction.Tree_Pair (arg2_0))
77-
instructions.Add (Instruction.Process__Tree arg0_0)
78-
instructions.Add (Instruction.Process__Tree arg1_0)
79-
| Tree.Sequential (arg0_0) ->
80-
instructions.Add (Instruction.Tree_Sequential ((List.length arg0_0)))
74+
| Tree.Const(arg0_0, arg1_0) -> cata.Tree.Const arg0_0 arg1_0 |> treeStack.Add
75+
| Tree.Pair(arg0_0, arg1_0, arg2_0) ->
76+
instructions.Add(Instruction.Tree_Pair(arg2_0))
77+
instructions.Add(Instruction.Process__Tree arg0_0)
78+
instructions.Add(Instruction.Process__Tree arg1_0)
79+
| Tree.Sequential(arg0_0) ->
80+
instructions.Add(Instruction.Tree_Sequential((List.length arg0_0)))
8181

8282
for elt in arg0_0 do
83-
instructions.Add (Instruction.Process__Tree elt)
84-
| Tree.Builder (arg0_0, arg1_0) ->
83+
instructions.Add(Instruction.Process__Tree elt)
84+
| Tree.Builder(arg0_0, arg1_0) ->
8585
instructions.Add Instruction.Tree_Builder
86-
instructions.Add (Instruction.Process__Tree arg0_0)
87-
instructions.Add (Instruction.Process__TreeBuilder arg1_0)
86+
instructions.Add(Instruction.Process__Tree arg0_0)
87+
instructions.Add(Instruction.Process__TreeBuilder arg1_0)
8888
| Instruction.TreeBuilder_Child ->
8989
let arg0_0 = treeBuilderStack.[treeBuilderStack.Count - 1]
90-
treeBuilderStack.RemoveAt (treeBuilderStack.Count - 1)
90+
treeBuilderStack.RemoveAt(treeBuilderStack.Count - 1)
9191
cata.TreeBuilder.Child arg0_0 |> treeBuilderStack.Add
9292
| Instruction.TreeBuilder_Parent ->
9393
let arg0_0 = treeStack.[treeStack.Count - 1]
94-
treeStack.RemoveAt (treeStack.Count - 1)
94+
treeStack.RemoveAt(treeStack.Count - 1)
9595
cata.TreeBuilder.Parent arg0_0 |> treeBuilderStack.Add
9696
| Instruction.Tree_Pair arg2_0 ->
9797
let arg0_0 = treeStack.[treeStack.Count - 1]
98-
treeStack.RemoveAt (treeStack.Count - 1)
98+
treeStack.RemoveAt(treeStack.Count - 1)
9999
let arg1_0 = treeStack.[treeStack.Count - 1]
100-
treeStack.RemoveAt (treeStack.Count - 1)
100+
treeStack.RemoveAt(treeStack.Count - 1)
101101
cata.Tree.Pair arg0_0 arg1_0 arg2_0 |> treeStack.Add
102102
| Instruction.Tree_Sequential arg0_0 ->
103103
let arg0_0_len = arg0_0
@@ -109,31 +109,30 @@ module TreeCata =
109109
}
110110
|> Seq.toList
111111

112-
treeStack.RemoveRange (treeStack.Count - arg0_0_len, arg0_0_len)
112+
treeStack.RemoveRange(treeStack.Count - arg0_0_len, arg0_0_len)
113113
cata.Tree.Sequential arg0_0 |> treeStack.Add
114114
| Instruction.Tree_Builder ->
115115
let arg0_0 = treeStack.[treeStack.Count - 1]
116-
treeStack.RemoveAt (treeStack.Count - 1)
116+
treeStack.RemoveAt(treeStack.Count - 1)
117117
let arg1_0 = treeBuilderStack.[treeBuilderStack.Count - 1]
118-
treeBuilderStack.RemoveAt (treeBuilderStack.Count - 1)
118+
treeBuilderStack.RemoveAt(treeBuilderStack.Count - 1)
119119
cata.Tree.Builder arg0_0 arg1_0 |> treeStack.Add
120120

121121
treeBuilderStack, treeStack
122122

123123
/// Execute the catamorphism.
124-
let runTreeBuilder
125-
(cata : TreeCata<'b, 'a, 'TreeBuilderRet, 'TreeRet>)
126-
(x : TreeBuilder<'b, 'a>)
127-
: 'TreeBuilderRet
128-
=
129-
let instructions = ResizeArray ()
130-
instructions.Add (Instruction.Process__TreeBuilder x)
124+
let runTreeBuilder (cata: TreeCata<'b, 'a, 'TreeBuilderRet, 'TreeRet>) (x: TreeBuilder<'b, 'a>) : 'TreeBuilderRet =
125+
let instructions = ResizeArray()
126+
instructions.Add(Instruction.Process__TreeBuilder x)
131127
let treeBuilderRetStack, treeRetStack = loop cata instructions
132128
Seq.exactlyOne treeBuilderRetStack
133129

134130
/// Execute the catamorphism.
135-
let runTree (cata : TreeCata<'b, 'a, 'TreeBuilderRet, 'TreeRet>) (x : Tree<'a, 'b>) : 'TreeRet =
136-
let instructions = ResizeArray ()
137-
instructions.Add (Instruction.Process__Tree x)
131+
let runTree (cata: TreeCata<'b, 'a, 'TreeBuilderRet, 'TreeRet>) (x: Tree<'a, 'b>) : 'TreeRet =
132+
let instructions = ResizeArray()
133+
instructions.Add(Instruction.Process__Tree x)
138134
let treeBuilderRetStack, treeRetStack = loop cata instructions
139135
Seq.exactlyOne treeRetStack
136+
137+
138+

‎ConsumePlugin/GeneratedCatamorphismNoAttribute.fs‎

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,28 @@ namespace ConsumePluginNoAttr
1313
/// Description of how to combine cases during a fold
1414
type TreeBuilderNoAttrCataCase<'b, 'a, 'TreeBuilderNoAttr, 'TreeNoAttr> =
1515
/// How to operate on the Child case
16-
abstract Child : 'TreeBuilderNoAttr -> 'TreeBuilderNoAttr
16+
abstract Child: 'TreeBuilderNoAttr -> 'TreeBuilderNoAttr
1717
/// How to operate on the Parent case
18-
abstract Parent : 'TreeNoAttr -> 'TreeBuilderNoAttr
18+
abstract Parent: 'TreeNoAttr -> 'TreeBuilderNoAttr
1919

2020
/// Description of how to combine cases during a fold
2121
type TreeNoAttrCataCase<'a, 'b, 'TreeBuilderNoAttr, 'TreeNoAttr> =
2222
/// How to operate on the Const case
23-
abstract Const : ConstNoAttr<'a> -> 'b -> 'TreeNoAttr
23+
abstract Const: ConstNoAttr<'a> -> 'b -> 'TreeNoAttr
2424
/// How to operate on the Pair case
25-
abstract Pair : 'TreeNoAttr -> 'TreeNoAttr -> PairOpKindNoAttr -> 'TreeNoAttr
25+
abstract Pair: 'TreeNoAttr -> 'TreeNoAttr -> PairOpKindNoAttr -> 'TreeNoAttr
2626
/// How to operate on the Sequential case
27-
abstract Sequential : 'TreeNoAttr list -> 'TreeNoAttr
27+
abstract Sequential: 'TreeNoAttr list -> 'TreeNoAttr
2828
/// How to operate on the Builder case
29-
abstract Builder : 'TreeNoAttr -> 'TreeBuilderNoAttr -> 'TreeNoAttr
29+
abstract Builder: 'TreeNoAttr -> 'TreeBuilderNoAttr -> 'TreeNoAttr
3030

3131
/// Specifies how to perform a fold (catamorphism) over the type TreeNoAttr and its friends.
3232
type TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttr, 'TreeNoAttr> =
3333
{
3434
/// How to perform a fold (catamorphism) over the type TreeBuilderNoAttr
35-
TreeBuilderNoAttr : TreeBuilderNoAttrCataCase<'b, 'a, 'TreeBuilderNoAttr, 'TreeNoAttr>
35+
TreeBuilderNoAttr: TreeBuilderNoAttrCataCase<'b, 'a, 'TreeBuilderNoAttr, 'TreeNoAttr>
3636
/// How to perform a fold (catamorphism) over the type TreeNoAttr
37-
TreeNoAttr : TreeNoAttrCataCase<'a, 'b, 'TreeBuilderNoAttr, 'TreeNoAttr>
37+
TreeNoAttr: TreeNoAttrCataCase<'a, 'b, 'TreeBuilderNoAttr, 'TreeNoAttr>
3838
}
3939

4040
/// Methods to perform a catamorphism over the type TreeNoAttr
@@ -51,54 +51,54 @@ module TreeNoAttrCata =
5151
| TreeNoAttr_Builder
5252

5353
let private loop
54-
(cata : TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttr, 'TreeNoAttr>)
55-
(instructions : ResizeArray<Instruction<'b, 'a>>)
54+
(cata: TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttr, 'TreeNoAttr>)
55+
(instructions: ResizeArray<Instruction<'b, 'a>>)
5656
=
57-
let treeNoAttrStack = ResizeArray<'TreeNoAttr> ()
58-
let treeBuilderNoAttrStack = ResizeArray<'TreeBuilderNoAttr> ()
57+
let treeNoAttrStack = ResizeArray<'TreeNoAttr>()
58+
let treeBuilderNoAttrStack = ResizeArray<'TreeBuilderNoAttr>()
5959

6060
while instructions.Count > 0 do
6161
let currentInstruction = instructions.[instructions.Count - 1]
62-
instructions.RemoveAt (instructions.Count - 1)
62+
instructions.RemoveAt(instructions.Count - 1)
6363

6464
match currentInstruction with
6565
| Instruction.Process__TreeBuilderNoAttr x ->
6666
match x with
67-
| TreeBuilderNoAttr.Child (arg0_0) ->
67+
| TreeBuilderNoAttr.Child(arg0_0) ->
6868
instructions.Add Instruction.TreeBuilderNoAttr_Child
69-
instructions.Add (Instruction.Process__TreeBuilderNoAttr arg0_0)
70-
| TreeBuilderNoAttr.Parent (arg0_0) ->
69+
instructions.Add(Instruction.Process__TreeBuilderNoAttr arg0_0)
70+
| TreeBuilderNoAttr.Parent(arg0_0) ->
7171
instructions.Add Instruction.TreeBuilderNoAttr_Parent
72-
instructions.Add (Instruction.Process__TreeNoAttr arg0_0)
72+
instructions.Add(Instruction.Process__TreeNoAttr arg0_0)
7373
| Instruction.Process__TreeNoAttr x ->
7474
match x with
75-
| TreeNoAttr.Const (arg0_0, arg1_0) -> cata.TreeNoAttr.Const arg0_0 arg1_0 |> treeNoAttrStack.Add
76-
| TreeNoAttr.Pair (arg0_0, arg1_0, arg2_0) ->
77-
instructions.Add (Instruction.TreeNoAttr_Pair (arg2_0))
78-
instructions.Add (Instruction.Process__TreeNoAttr arg0_0)
79-
instructions.Add (Instruction.Process__TreeNoAttr arg1_0)
80-
| TreeNoAttr.Sequential (arg0_0) ->
81-
instructions.Add (Instruction.TreeNoAttr_Sequential ((List.length arg0_0)))
75+
| TreeNoAttr.Const(arg0_0, arg1_0) -> cata.TreeNoAttr.Const arg0_0 arg1_0 |> treeNoAttrStack.Add
76+
| TreeNoAttr.Pair(arg0_0, arg1_0, arg2_0) ->
77+
instructions.Add(Instruction.TreeNoAttr_Pair(arg2_0))
78+
instructions.Add(Instruction.Process__TreeNoAttr arg0_0)
79+
instructions.Add(Instruction.Process__TreeNoAttr arg1_0)
80+
| TreeNoAttr.Sequential(arg0_0) ->
81+
instructions.Add(Instruction.TreeNoAttr_Sequential((List.length arg0_0)))
8282

8383
for elt in arg0_0 do
84-
instructions.Add (Instruction.Process__TreeNoAttr elt)
85-
| TreeNoAttr.Builder (arg0_0, arg1_0) ->
84+
instructions.Add(Instruction.Process__TreeNoAttr elt)
85+
| TreeNoAttr.Builder(arg0_0, arg1_0) ->
8686
instructions.Add Instruction.TreeNoAttr_Builder
87-
instructions.Add (Instruction.Process__TreeNoAttr arg0_0)
88-
instructions.Add (Instruction.Process__TreeBuilderNoAttr arg1_0)
87+
instructions.Add(Instruction.Process__TreeNoAttr arg0_0)
88+
instructions.Add(Instruction.Process__TreeBuilderNoAttr arg1_0)
8989
| Instruction.TreeBuilderNoAttr_Child ->
9090
let arg0_0 = treeBuilderNoAttrStack.[treeBuilderNoAttrStack.Count - 1]
91-
treeBuilderNoAttrStack.RemoveAt (treeBuilderNoAttrStack.Count - 1)
91+
treeBuilderNoAttrStack.RemoveAt(treeBuilderNoAttrStack.Count - 1)
9292
cata.TreeBuilderNoAttr.Child arg0_0 |> treeBuilderNoAttrStack.Add
9393
| Instruction.TreeBuilderNoAttr_Parent ->
9494
let arg0_0 = treeNoAttrStack.[treeNoAttrStack.Count - 1]
95-
treeNoAttrStack.RemoveAt (treeNoAttrStack.Count - 1)
95+
treeNoAttrStack.RemoveAt(treeNoAttrStack.Count - 1)
9696
cata.TreeBuilderNoAttr.Parent arg0_0 |> treeBuilderNoAttrStack.Add
9797
| Instruction.TreeNoAttr_Pair arg2_0 ->
9898
let arg0_0 = treeNoAttrStack.[treeNoAttrStack.Count - 1]
99-
treeNoAttrStack.RemoveAt (treeNoAttrStack.Count - 1)
99+
treeNoAttrStack.RemoveAt(treeNoAttrStack.Count - 1)
100100
let arg1_0 = treeNoAttrStack.[treeNoAttrStack.Count - 1]
101-
treeNoAttrStack.RemoveAt (treeNoAttrStack.Count - 1)
101+
treeNoAttrStack.RemoveAt(treeNoAttrStack.Count - 1)
102102
cata.TreeNoAttr.Pair arg0_0 arg1_0 arg2_0 |> treeNoAttrStack.Add
103103
| Instruction.TreeNoAttr_Sequential arg0_0 ->
104104
let arg0_0_len = arg0_0
@@ -110,35 +110,36 @@ module TreeNoAttrCata =
110110
}
111111
|> Seq.toList
112112

113-
treeNoAttrStack.RemoveRange (treeNoAttrStack.Count - arg0_0_len, arg0_0_len)
113+
treeNoAttrStack.RemoveRange(treeNoAttrStack.Count - arg0_0_len, arg0_0_len)
114114
cata.TreeNoAttr.Sequential arg0_0 |> treeNoAttrStack.Add
115115
| Instruction.TreeNoAttr_Builder ->
116116
let arg0_0 = treeNoAttrStack.[treeNoAttrStack.Count - 1]
117-
treeNoAttrStack.RemoveAt (treeNoAttrStack.Count - 1)
117+
treeNoAttrStack.RemoveAt(treeNoAttrStack.Count - 1)
118118
let arg1_0 = treeBuilderNoAttrStack.[treeBuilderNoAttrStack.Count - 1]
119-
treeBuilderNoAttrStack.RemoveAt (treeBuilderNoAttrStack.Count - 1)
119+
treeBuilderNoAttrStack.RemoveAt(treeBuilderNoAttrStack.Count - 1)
120120
cata.TreeNoAttr.Builder arg0_0 arg1_0 |> treeNoAttrStack.Add
121121

122122
treeBuilderNoAttrStack, treeNoAttrStack
123123

124124
/// Execute the catamorphism.
125125
let runTreeBuilderNoAttr
126-
(cata : TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttrRet, 'TreeNoAttrRet>)
127-
(x : TreeBuilderNoAttr<'b, 'a>)
128-
: 'TreeBuilderNoAttrRet
129-
=
130-
let instructions = ResizeArray ()
131-
instructions.Add (Instruction.Process__TreeBuilderNoAttr x)
126+
(cata: TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttrRet, 'TreeNoAttrRet>)
127+
(x: TreeBuilderNoAttr<'b, 'a>)
128+
: 'TreeBuilderNoAttrRet =
129+
let instructions = ResizeArray()
130+
instructions.Add(Instruction.Process__TreeBuilderNoAttr x)
132131
let treeBuilderNoAttrRetStack, treeNoAttrRetStack = loop cata instructions
133132
Seq.exactlyOne treeBuilderNoAttrRetStack
134133

135134
/// Execute the catamorphism.
136135
let runTreeNoAttr
137-
(cata : TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttrRet, 'TreeNoAttrRet>)
138-
(x : TreeNoAttr<'a, 'b>)
139-
: 'TreeNoAttrRet
140-
=
141-
let instructions = ResizeArray ()
142-
instructions.Add (Instruction.Process__TreeNoAttr x)
136+
(cata: TreeNoAttrCata<'b, 'a, 'TreeBuilderNoAttrRet, 'TreeNoAttrRet>)
137+
(x: TreeNoAttr<'a, 'b>)
138+
: 'TreeNoAttrRet =
139+
let instructions = ResizeArray()
140+
instructions.Add(Instruction.Process__TreeNoAttr x)
143141
let treeBuilderNoAttrRetStack, treeNoAttrRetStack = loop cata instructions
144142
Seq.exactlyOne treeNoAttrRetStack
143+
144+
145+

0 commit comments

Comments
 (0)