Skip to content

Correct range for struct tuples. #13840

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

Merged
merged 2 commits into from
Sep 8, 2022
Merged

Correct range for struct tuples. #13840

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
d87620f
Correct range for struct tuples.
nojaf Sep 5, 2022
e63c5f2
Merge branch 'main' into syn-type-tuple-struct
dsyme Sep 8, 2022
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
4 changes: 2 additions & 2 deletions src/Compiler/SyntaxTree/ParseHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,7 +847,7 @@ let adjustHatPrefixToTyparLookup mFull rightExpr =
take rightExpr

// The last element of elementTypes does not have a star or slash
let mkSynTypeTuple (isStruct: bool) (elementTypes: SynTupleTypeSegment list) : SynType =
let mkSynTypeTuple (elementTypes: SynTupleTypeSegment list) : SynType =
let range =
match elementTypes with
| [] -> Range.Zero
Expand All @@ -856,4 +856,4 @@ let mkSynTypeTuple (isStruct: bool) (elementTypes: SynTupleTypeSegment list) : S
(head.Range, tail)
||> List.fold (fun acc segment -> unionRanges acc segment.Range)

SynType.Tuple(isStruct, elementTypes, range)
SynType.Tuple(false, elementTypes, range)
2 changes: 1 addition & 1 deletion src/Compiler/SyntaxTree/ParseHelpers.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,4 +179,4 @@ val mkSynMemberDefnGetSet:
/// Incorporate a '^' for an qualified access to a generic type parameter
val adjustHatPrefixToTyparLookup: mFull: range -> rightExpr: SynExpr -> SynExpr

val mkSynTypeTuple: isStruct: bool -> elementTypes: SynTupleTypeSegment list -> SynType
val mkSynTypeTuple: elementTypes: SynTupleTypeSegment list -> SynType
14 changes: 8 additions & 6 deletions src/Compiler/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5064,7 +5064,7 @@ topTupleType:
let mStar = rhs parseState 2
let path = SynTupleTypeSegment.Type t :: SynTupleTypeSegment.Star mStar :: (List.map fst $3)
let mdata = argInfo :: (List.choose snd $3)
mkSynTypeTuple false path, mdata }
mkSynTypeTuple path, mdata }

| topAppType
{ let ty, mdata = $1 in ty, [mdata] }
Expand Down Expand Up @@ -5120,19 +5120,19 @@ tupleType:
| appType STAR tupleOrQuotTypeElements
{ let mStar = rhs parseState 2
let path = SynTupleTypeSegment.Type $1 :: SynTupleTypeSegment.Star mStar :: $3
mkSynTypeTuple false path }
mkSynTypeTuple path }

| INFIX_STAR_DIV_MOD_OP tupleOrQuotTypeElements
{ if $1 <> "/" then reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnexpectedInfixOperator());
let mSlash = rhs parseState 1
let path = SynTupleTypeSegment.Slash mSlash :: $2
mkSynTypeTuple false path }
mkSynTypeTuple path }

| appType INFIX_STAR_DIV_MOD_OP tupleOrQuotTypeElements
{ if $2 <> "/" then reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnexpectedInfixOperator());
let mSlash = rhs parseState 2
let path = SynTupleTypeSegment.Type $1 :: SynTupleTypeSegment.Slash mSlash :: $3
mkSynTypeTuple false path }
mkSynTypeTuple path }

| appType %prec prec_tuptyp_prefix
{ $1 }
Expand Down Expand Up @@ -5284,13 +5284,15 @@ atomType:
| STRUCT LPAREN appType STAR tupleOrQuotTypeElements rparen
{ let mStar = rhs parseState 4
let path = SynTupleTypeSegment.Type $3 :: SynTupleTypeSegment.Star mStar :: $5
mkSynTypeTuple true path }
let m = rhs2 parseState 1 6
SynType.Tuple(true, path, m) }

| STRUCT LPAREN appType STAR tupleOrQuotTypeElements recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnmatchedParen())
let mStar = rhs parseState 4
let path = SynTupleTypeSegment.Type $3 :: SynTupleTypeSegment.Star mStar :: $5
mkSynTypeTuple true path }
let m = rhs2 parseState 1 5
SynType.Tuple(true, path, m) }

| STRUCT LPAREN appType STAR recover
{ reportParseErrorAt (rhs parseState 2) (FSComp.SR.parsUnmatchedParen())
Expand Down
40 changes: 40 additions & 0 deletions tests/service/SyntaxTreeTests/TypeTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,3 +484,43 @@ let ``SynType.Fun has range of arrow`` () =
])) ->
assertRange (2, 21) (2, 23) mArrow
| _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"

[<Test>]
let ``SynType.Tuple with struct`` () =
let parseResults =
getParseResults
"""
let _: struct (int * int) = ()
"""

match parseResults with
| ParsedInput.ImplFile (ParsedImplFileInput(modules = [
SynModuleOrNamespace.SynModuleOrNamespace(decls = [
SynModuleDecl.Let(bindings = [ SynBinding(returnInfo = Some (SynBindingReturnInfo(typeName =
SynType.Tuple(true, [ SynTupleTypeSegment.Type _ ; SynTupleTypeSegment.Star _ ; SynTupleTypeSegment.Type _ ], mTuple)))) ])
])
])
) ->
assertRange (2, 7) (2, 25) mTuple

| _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"

[<Test>]
let ``SynType.Tuple with struct, recovery`` () =
let parseResults =
getParseResults
"""
let _: struct (int * int = ()
"""

match parseResults with
| ParsedInput.ImplFile (ParsedImplFileInput(modules = [
SynModuleOrNamespace.SynModuleOrNamespace(decls = [
SynModuleDecl.Let(bindings = [ SynBinding(returnInfo = Some (SynBindingReturnInfo(typeName =
SynType.Tuple(true, [ SynTupleTypeSegment.Type _ ; SynTupleTypeSegment.Star _ ; SynTupleTypeSegment.Type _ ], mTuple)))) ])
])
])
) ->
assertRange (2, 7) (2, 24) mTuple

| _ -> Assert.Fail $"Could not get valid AST, got {parseResults}"