Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add missing case for underscore in 'for _ =' #6867

Merged
merged 2 commits into from
Jun 2, 2019
Merged

Add missing case for underscore in 'for _ =' #6867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce6c6be
Add missing case for underscore in 'for _ ='
gusty May 25, 2019
db4fdbd
Add a forloop test with a wildcard
gusty May 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/fsharp/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ let mkDefnBindings (mWhole,BindingSetPreAttrs(_,isRec,isUse,declsPreAttrs,_bindi
attrDecls @ letDecls

let idOfPat m p =
match p with
match p with
| SynPat.Wild r -> mkSynId r "_"
| SynPat.Named (SynPat.Wild _,id,false,_,_) -> id
| SynPat.LongIdent(LongIdentWithDots([id],_),_,None, SynConstructorArgs.Pats [], None,_) -> id
| _ -> raiseParseErrorAt m (FSComp.SR.parsIntegerForLoopRequiresSimpleIdentifier())
Expand Down
10 changes: 10 additions & 0 deletions tests/fsharp/core/forexpression/test.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ let testData =
let expectedArraySum = 167167000 // Find an expression for this sum from count
let expectedRangeSum = ((count + 1) * count) / 2
let expectedStringSum = 30
let expectedWildCard = count + 1

let getTestData (inner : int [] -> #seq<int>) (outer : #seq<int> [] -> #seq<'U>) =
(testData |> Array.map inner) |> outer
Expand Down Expand Up @@ -115,6 +116,13 @@ let sumOverString () =
sum <- sum + ((int i) - (int '0'))
#endif
sum

// usingWildcard counts using a wildcard in a for loop
let usingWildcard () =
let mutable sum = 0
for _ = 0 to count do
sum <- sum + 1
sum

let arraySum = sumOverArray ()
let seqSum = sumOverSeq ()
Expand All @@ -124,6 +132,7 @@ let listSum = sumOverList ()
let ilistSum = sumOverIList ()
let rangeSum = sumOverRange ()
let stringSum = sumOverString ()
let wildCard = usingWildcard ()

do test "arraySum" (expectedArraySum = arraySum )
do test "seqSum" (expectedArraySum = seqSum )
Expand All @@ -133,6 +142,7 @@ do test "listSum" (expectedArraySum = listSum )
do test "ilistSum" (expectedArraySum = ilistSum )
do test "rangeSum" (expectedRangeSum = rangeSum )
do test "stringSum" (expectedStringSum = stringSum )
do test "wildCard" (expectedWildCard = wildCard )

#if TESTS_AS_APP
let RUN() = !failures
Expand Down