diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2020-10-04 20:46:41 +0100 |
|---|---|---|
| committer | Alan Zimmerman <alan.zimm@gmail.com> | 2020-10-20 08:35:34 +0100 |
| commit | ea736839d85594c95490dcf02d3325c2bbc68f33 (patch) | |
| tree | 6f6c0335e216f67b63caf9e4a46d3e5bb6e852af /testsuite/tests/parser | |
| parent | 59b08a5d192e102f66a6d9260cc8466d7428cffe (diff) | |
| download | haskell-ea736839d85594c95490dcf02d3325c2bbc68f33.tar.gz | |
API Annotations: Keep track of unicode for linear arrow notationwip/az/unicode-hsscaled
The linear arrow can be parsed as `%1 ->` or a direct single token unicode
equivalent.
Make sure that this distinction is captured in the parsed AST by using
IsUnicodeSyntax where it appears, and introduce a new API Annotation,
AnnMult to represent its location when unicode is not used.
Updated haddock submodule
Diffstat (limited to 'testsuite/tests/parser')
4 files changed, 32 insertions, 16 deletions
diff --git a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr index 5a6c569ad3..dc48459d17 100644 --- a/testsuite/tests/parser/should_compile/DumpParsedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpParsedAst.stderr @@ -66,7 +66,8 @@ (Nothing) (PrefixCon [(HsScaled - (HsLinearArrow) + (HsLinearArrow + (NormalSyntax)) ({ DumpParsedAst.hs:7:26-30 } (HsTyVar (NoExtField) @@ -258,7 +259,8 @@ (Nothing) (PrefixCon [(HsScaled - (HsLinearArrow) + (HsLinearArrow + (NormalSyntax)) ({ DumpParsedAst.hs:14:25-29 } (HsParTy (NoExtField) @@ -392,7 +394,8 @@ ({ DumpParsedAst.hs:16:31-39 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpParsedAst.hs:16:31 } (HsTyVar (NoExtField) diff --git a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr index 4b5c58d43b..599d369ff5 100644 --- a/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr +++ b/testsuite/tests/parser/should_compile/DumpRenamedAst.stderr @@ -100,7 +100,8 @@ (Nothing) (PrefixCon [(HsScaled - (HsLinearArrow) + (HsLinearArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:9:26-30 } (HsTyVar (NoExtField) @@ -254,7 +255,8 @@ ({ DumpRenamedAst.hs:15:20-33 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:15:20 } (HsTyVar (NoExtField) @@ -264,7 +266,8 @@ ({ DumpRenamedAst.hs:15:25-33 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:15:25 } (HsTyVar (NoExtField) @@ -308,7 +311,8 @@ ({ DumpRenamedAst.hs:18:28-36 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:18:28 } (HsTyVar (NoExtField) @@ -332,14 +336,16 @@ ({ DumpRenamedAst.hs:18:42-60 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:18:42-52 } (HsParTy (NoExtField) ({ DumpRenamedAst.hs:18:43-51 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:18:43 } (HsTyVar (NoExtField) @@ -370,7 +376,8 @@ (Nothing) (PrefixCon [(HsScaled - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:19:10-34 } (HsParTy (NoExtField) @@ -388,7 +395,8 @@ ({ DumpRenamedAst.hs:19:22-33 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:19:22-25 } (HsAppTy (NoExtField) @@ -496,7 +504,8 @@ (Nothing) (PrefixCon [(HsScaled - (HsLinearArrow) + (HsLinearArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:21:25-29 } (HsParTy (NoExtField) @@ -620,7 +629,8 @@ ({ DumpRenamedAst.hs:23:31-39 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ DumpRenamedAst.hs:23:31 } (HsTyVar (NoExtField) diff --git a/testsuite/tests/parser/should_compile/KindSigs.stderr b/testsuite/tests/parser/should_compile/KindSigs.stderr index c5976593d3..13aa2e6147 100644 --- a/testsuite/tests/parser/should_compile/KindSigs.stderr +++ b/testsuite/tests/parser/should_compile/KindSigs.stderr @@ -276,7 +276,8 @@ ({ KindSigs.hs:22:8-44 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ KindSigs.hs:22:8-20 } (HsParTy (NoExtField) @@ -300,7 +301,8 @@ ({ KindSigs.hs:22:25-44 } (HsFunTy (NoExtField) - (HsUnrestrictedArrow) + (HsUnrestrictedArrow + (NormalSyntax)) ({ KindSigs.hs:22:25-28 } (HsTyVar (NoExtField) diff --git a/testsuite/tests/parser/should_compile/T14189.stderr b/testsuite/tests/parser/should_compile/T14189.stderr index f794049568..32ae85e4dc 100644 --- a/testsuite/tests/parser/should_compile/T14189.stderr +++ b/testsuite/tests/parser/should_compile/T14189.stderr @@ -42,7 +42,8 @@ (Nothing) (PrefixCon [(HsScaled - (HsLinearArrow) + (HsLinearArrow + (NormalSyntax)) ({ T14189.hs:6:18-20 } (HsTyVar (NoExtField) |