From 1a3343932919ed3aafa7f2cc27ad9b283397c6b7 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Thu, 7 Sep 2023 16:33:31 +0200 Subject: [PATCH] Undo `inherit` change --- src/Compiler/pars.fsy | 7 +++---- tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl | 5 +++-- tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl | 5 +++-- tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl | 4 +++- tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl | 4 +++- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/Compiler/pars.fsy b/src/Compiler/pars.fsy index 00d132155e9..f10bb7be2e9 100644 --- a/src/Compiler/pars.fsy +++ b/src/Compiler/pars.fsy @@ -2300,10 +2300,9 @@ inheritsDefn: SynMemberDefn.ImplicitInherit($2, $4, $5, mDecl) } | INHERIT ends_coming_soon_or_recover - { let mInherit = rhs parseState 1 - if not $2 then errorR (Error(FSComp.SR.parsTypeNameCannotBeEmpty (), mInherit)) - let ty = SynType.FromParseError(mInherit.EndRange) - SynMemberDefn.Inherit(ty, None, mInherit) } + { let mDecl = (rhs parseState 1) + if not $2 then errorR (Error(FSComp.SR.parsTypeNameCannotBeEmpty (), mDecl)) + SynMemberDefn.Inherit(SynType.LongIdent(SynLongIdent([], [], [])), None, mDecl) } optAsSpec: | asSpec diff --git a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl index aa982025cf9..eeab1704856 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 03.fs.bsl @@ -11,8 +11,9 @@ ImplFile false, None, (3,5--3,6)), ObjectModel (Unspecified, - [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11))], - (4,4--4,11)), [], None, (3,5--4,11), + [Inherit + (LongIdent (SynLongIdent ([], [], [])), None, + (4,4--4,11))], (4,4--4,11)), [], None, (3,5--4,11), { LeadingKeyword = Type (3,0--3,4) EqualsRange = Some (3,7--3,8) WithKeyword = None })], (3,0--4,11))], diff --git a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl index d88f5d29b11..9c03baf2b56 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 04.fs.bsl @@ -11,8 +11,9 @@ ImplFile false, None, (3,5--3,6)), ObjectModel (Unspecified, - [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11))], - (4,4--4,11)), [], None, (3,5--4,11), + [Inherit + (LongIdent (SynLongIdent ([], [], [])), None, + (4,4--4,11))], (4,4--4,11)), [], None, (3,5--4,11), { LeadingKeyword = Type (3,0--3,4) EqualsRange = Some (3,7--3,8) WithKeyword = None })], (3,0--4,11)); diff --git a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl index db4fed86e71..37100c58ad0 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 05.fs.bsl @@ -11,7 +11,9 @@ ImplFile false, None, (3,5--3,6)), ObjectModel (Unspecified, - [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11)); + [Inherit + (LongIdent (SynLongIdent ([], [], [])), None, + (4,4--4,11)); Member (SynBinding (None, Normal, false, false, [], diff --git a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl index 0635de73f53..28dcc0d77f9 100644 --- a/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl +++ b/tests/service/data/SyntaxTree/Member/Inherit 08.fs.bsl @@ -11,7 +11,9 @@ ImplFile false, None, (3,5--3,6)), ObjectModel (Unspecified, - [Inherit (FromParseError (4,11--4,11), None, (4,4--4,11)); + [Inherit + (LongIdent (SynLongIdent ([], [], [])), None, + (4,4--4,11)); Member (SynBinding (None, Normal, false, false, [],