diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-03-06 19:26:49 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-03-06 19:26:49 -0500 |
| commit | 65868397a59e61b575c70c0757dddbbba9cb5ac9 (patch) | |
| tree | 91254d8ae801ed55c82f44efcafabac88df28415 /hypsrc-test | |
| parent | 0bf811ba98af90f852066734977aacb898ba8e69 (diff) | |
| parent | e57036c8fa31679243a97f4c14fdfbcbc07da9c5 (diff) | |
Merge remote-tracking branch 'origin/ghc-head' into HEAD
Diffstat (limited to 'hypsrc-test')
32 files changed, 509 insertions, 381 deletions
diff --git a/hypsrc-test/ref/src/Bug1091.html b/hypsrc-test/ref/src/Bug1091.html index a9c7d163..3aad9cc8 100644 --- a/hypsrc-test/ref/src/Bug1091.html +++ b/hypsrc-test/ref/src/Bug1091.html @@ -7,12 +7,19 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE CPP #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span + ><span class="hs-pragma" + >{-# LANGUAGE CPP #-}</span + ><span + > +</span + ><span id="line-3" + ></span ><span class="hs-keyword" >module</span ><span diff --git a/hypsrc-test/ref/src/CPP.html b/hypsrc-test/ref/src/CPP.html index 719be7f8..41cb8f8c 100644 --- a/hypsrc-test/ref/src/CPP.html +++ b/hypsrc-test/ref/src/CPP.html @@ -7,12 +7,19 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE CPP #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span + ><span class="hs-pragma" + >{-# LANGUAGE CPP #-}</span + ><span + > +</span + ><span id="line-3" + ></span ><span class="hs-keyword" >module</span ><span @@ -31,7 +38,7 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span class="annot" ><a href="CPP.html#foo" @@ -52,7 +59,7 @@ ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span id="foo" ><span class="annot" @@ -92,7 +99,7 @@ ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span class="annot" ><a href="CPP.html#bar" @@ -113,7 +120,7 @@ ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span id="bar" ><span class="annot" @@ -147,26 +154,26 @@ ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span class="hs-comment" >-- " single quotes are fine in line comments</span ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span class="hs-comment" >-- {- unclosed block comments are fine in line comments</span ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span class="hs-comment" >-- Multiline CPP is also fine</span @@ -178,7 +185,7 @@ ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span class="annot" ><a href="CPP.html#baz" @@ -199,7 +206,7 @@ ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span id="baz" ><span class="annot" @@ -228,7 +235,7 @@ ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html index 2a44be99..688b6db6 100644 --- a/hypsrc-test/ref/src/Classes.html +++ b/hypsrc-test/ref/src/Classes.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -19,17 +26,17 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="hs-keyword" >class</span @@ -60,7 +67,7 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span > </span @@ -97,7 +104,7 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span @@ -148,12 +155,12 @@ ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span class="hs-keyword" >instance</span @@ -178,7 +185,7 @@ ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span > </span @@ -210,7 +217,7 @@ forall a. a -> a ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span @@ -273,12 +280,12 @@ forall a. a -> a ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span class="hs-keyword" >instance</span @@ -311,7 +318,7 @@ forall a. a -> a ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span > </span @@ -343,7 +350,7 @@ forall (t :: * -> *) a. Foldable t => t a -> Int ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span > </span @@ -392,17 +399,17 @@ forall (t :: * -> *) a. Foldable t => t a -> Int ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span class="hs-keyword" >class</span @@ -453,7 +460,7 @@ forall (t :: * -> *) a. Foldable t => t a -> Int ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span > </span @@ -506,7 +513,7 @@ forall (t :: * -> *) a. Foldable t => t a -> Int ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span > </span @@ -597,12 +604,12 @@ forall a. Foo' a => [a] -> a ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span > </span @@ -645,7 +652,7 @@ forall a. Foo' a => [a] -> a ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span > </span @@ -750,12 +757,12 @@ forall a. Foo a => a -> Int ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span class="hs-keyword" >instance</span @@ -782,7 +789,7 @@ forall a. Foo a => a -> Int ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span > </span @@ -814,12 +821,12 @@ forall (t :: * -> *) a. (Foldable t, Num a) => t a -> a ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span class="hs-keyword" >instance</span @@ -854,7 +861,7 @@ forall (t :: * -> *) a. (Foldable t, Num a) => t a -> a ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span > </span @@ -896,17 +903,17 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ><span > </span - ><span id="line-30" + ><span id="line-31" ></span ><span > </span - ><span id="line-31" + ><span id="line-32" ></span ><span class="hs-keyword" >class</span @@ -937,7 +944,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-32" + ><span id="line-33" ></span ><span > </span @@ -1072,12 +1079,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-33" + ><span id="line-34" ></span ><span > </span - ><span id="line-34" + ><span id="line-35" ></span ><span class="hs-keyword" >instance</span @@ -1102,7 +1109,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-35" + ><span id="line-36" ></span ><span > </span @@ -1198,7 +1205,7 @@ forall a b. a -> b -> a ><span > </span - ><span id="line-36" + ><span id="line-37" ></span ><span > </span @@ -1289,7 +1296,7 @@ forall a b. a -> b -> a ><span > </span - ><span id="line-37" + ><span id="line-38" ></span ><span > </span @@ -1380,7 +1387,7 @@ forall a b. a -> b -> a ><span > </span - ><span id="line-38" + ><span id="line-39" ></span ><span > </span @@ -1471,7 +1478,7 @@ forall a b. a -> b -> a ><span > </span - ><span id="line-39" + ><span id="line-40" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Constructors.html b/hypsrc-test/ref/src/Constructors.html index 2cc234ac..d5c3dd33 100644 --- a/hypsrc-test/ref/src/Constructors.html +++ b/hypsrc-test/ref/src/Constructors.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -19,17 +26,17 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="hs-keyword" >data</span @@ -46,7 +53,7 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span > </span @@ -65,7 +72,7 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span @@ -84,7 +91,7 @@ ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span > </span @@ -117,12 +124,12 @@ ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span class="hs-keyword" >newtype</span @@ -189,17 +196,17 @@ ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span class="annot" ><a href="Constructors.html#bar" @@ -242,7 +249,7 @@ ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span id="bar" ><span class="annot" @@ -273,7 +280,7 @@ ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span id="baz" ><span class="annot" @@ -304,7 +311,7 @@ ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span id="quux" ><span class="annot" @@ -355,17 +362,17 @@ ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span class="annot" ><a href="Constructors.html#unfoo" @@ -398,7 +405,7 @@ ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span id="unfoo" ><span class="annot" @@ -438,7 +445,7 @@ ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span class="annot" ><a href="Constructors.html#unfoo" @@ -473,7 +480,7 @@ ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span class="annot" ><a href="Constructors.html#unfoo" @@ -588,17 +595,17 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span class="annot" ><a href="Constructors.html#unnorf" @@ -637,7 +644,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span id="unnorf" ><span class="annot" @@ -723,7 +730,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span class="annot" ><a href="Constructors.html#unnorf" @@ -814,7 +821,7 @@ forall a. [a] -> [a] ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span class="annot" ><a href="Constructors.html#unnorf" @@ -848,17 +855,17 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ><span > </span - ><span id="line-30" + ><span id="line-31" ></span ><span class="annot" ><a href="Constructors.html#unnorf%27" @@ -891,7 +898,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-31" + ><span id="line-32" ></span ><span id="unnorf%27" ><span class="annot" @@ -1047,7 +1054,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-32" + ><span id="line-33" ></span ><span > </span @@ -1148,7 +1155,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-33" + ><span id="line-34" ></span ><span > </span @@ -1157,7 +1164,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-34" + ><span id="line-35" ></span ><span > </span @@ -1278,7 +1285,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-35" + ><span id="line-36" ></span ><span > </span @@ -1383,7 +1390,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-36" + ><span id="line-37" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Identifiers.html b/hypsrc-test/ref/src/Identifiers.html index e0f88772..a983182d 100644 --- a/hypsrc-test/ref/src/Identifiers.html +++ b/hypsrc-test/ref/src/Identifiers.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -19,17 +26,17 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="annot" ><a href="Identifiers.html#foo" @@ -90,7 +97,7 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span id="foo" ><span class="annot" @@ -253,7 +260,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span id="bar" ><span class="annot" @@ -416,7 +423,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span id="baz" ><span class="annot" @@ -557,12 +564,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span class="annot" ><a href="Identifiers.html#quux" @@ -593,7 +600,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span id="quux" ><span class="annot" @@ -711,12 +718,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span class="annot" ><a href="Identifiers.html#norf" @@ -767,7 +774,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span id="norf" ><span class="annot" @@ -822,7 +829,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span > </span @@ -887,7 +894,7 @@ forall a. Ord a => a -> a -> Bool ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span > </span @@ -952,7 +959,7 @@ forall a. Ord a => a -> a -> Bool ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span @@ -1017,7 +1024,7 @@ forall a. Ord a => a -> a -> Bool ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span > </span @@ -1101,17 +1108,17 @@ forall a. Ord a => a -> a -> Bool ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span class="annot" ><a href="Identifiers.html#main" @@ -1138,7 +1145,7 @@ forall a. Ord a => a -> a -> Bool ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span id="main" ><span class="annot" @@ -1162,7 +1169,7 @@ forall a. Ord a => a -> a -> Bool ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span > </span @@ -1239,7 +1246,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span > </span @@ -1305,7 +1312,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span > </span @@ -1393,7 +1400,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span > </span @@ -1402,7 +1409,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span > </span @@ -1433,7 +1440,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span > </span @@ -1464,7 +1471,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span > </span @@ -1495,7 +1502,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/LinkingIdentifiers.html b/hypsrc-test/ref/src/LinkingIdentifiers.html index c923b6da..3a6cca56 100644 --- a/hypsrc-test/ref/src/LinkingIdentifiers.html +++ b/hypsrc-test/ref/src/LinkingIdentifiers.html @@ -6,41 +6,48 @@ ></head ><body ><pre - ><span class="hs-comment" - >-- Tests that the identifers/operators are properly linked even when:</span + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span ><span class="hs-comment" - >--</span + >-- Tests that the identifers/operators are properly linked even when:</span ><span > </span ><span id="line-3" ></span ><span class="hs-comment" - >-- * backquoted, parenthesized, vanilla</span + >--</span ><span > </span ><span id="line-4" ></span ><span class="hs-comment" - >-- * qualified, not-qualified</span + >-- * backquoted, parenthesized, vanilla</span ><span > </span ><span id="line-5" ></span ><span class="hs-comment" - >--</span + >-- * qualified, not-qualified</span ><span > </span ><span id="line-6" ></span + ><span class="hs-comment" + >--</span + ><span + > +</span + ><span id="line-7" + ></span ><span class="hs-keyword" >module</span ><span @@ -54,12 +61,12 @@ ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span class="annot" ><a href="LinkingIdentifiers.html#ident" @@ -100,7 +107,7 @@ ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span id="" ><span class="annot" @@ -222,7 +229,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span class="annot" ><a href="LinkingIdentifiers.html#ident" @@ -331,12 +338,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span class="annot" ><a href="LinkingIdentifiers.html#%2B%2B%3A%2B%2B" @@ -377,7 +384,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span id="" ><span class="annot" @@ -499,7 +506,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span class="annot" ><a href="LinkingIdentifiers.html#%2B%2B%3A%2B%2B" @@ -608,7 +615,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Literals.html b/hypsrc-test/ref/src/Literals.html index db6d37b3..94deb304 100644 --- a/hypsrc-test/ref/src/Literals.html +++ b/hypsrc-test/ref/src/Literals.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -19,17 +26,17 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="annot" ><a href="Literals.html#str" @@ -50,7 +57,7 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span id="str" ><span class="annot" @@ -79,12 +86,12 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span id="" ><span class="annot" @@ -127,7 +134,7 @@ ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span id="num" ><span class="annot" @@ -232,12 +239,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span id="" ><span class="annot" @@ -280,7 +287,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span id="frac" ><span class="annot" @@ -309,12 +316,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span id="" ><span class="annot" @@ -355,7 +362,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span id="list" ><span class="annot" @@ -413,12 +420,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span class="annot" ><a href="Literals.html#pair" @@ -479,7 +486,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span id="pair" ><span class="annot" @@ -545,7 +552,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html index 2ce87a6e..04006a0d 100644 --- a/hypsrc-test/ref/src/Operators.html +++ b/hypsrc-test/ref/src/Operators.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -19,17 +26,17 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span id="" ><span class="annot" @@ -90,7 +97,7 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span id="" ><span class="annot" @@ -189,12 +196,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span id="" ><span class="annot" @@ -255,7 +262,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span id="" ><span class="annot" @@ -335,12 +342,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span id="" ><span class="annot" @@ -401,7 +408,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span id="%2A%2A%2A" ><span class="annot" @@ -451,7 +458,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span class="annot" ><a href="Operators.html#%2A%2A%2A" @@ -568,12 +575,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span id="" ><span class="annot" @@ -638,7 +645,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span id="" ><span class="annot" @@ -732,12 +739,12 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span id="" ><span class="annot" @@ -810,7 +817,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span id="" ><span class="annot" @@ -954,17 +961,17 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span id="" ><span id="" @@ -1047,7 +1054,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span id="" ><span class="annot" @@ -1141,7 +1148,7 @@ forall a b. (a -> b) -> a -> b ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Polymorphism.html b/hypsrc-test/ref/src/Polymorphism.html index 1b166aff..e1c13828 100644 --- a/hypsrc-test/ref/src/Polymorphism.html +++ b/hypsrc-test/ref/src/Polymorphism.html @@ -7,19 +7,21 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE RankNTypes #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span ><span class="hs-pragma" - >{-# LANGUAGE ScopedTypeVariables #-}</span + >{-# LANGUAGE RankNTypes #-}</span ><span > </span ><span id="line-3" ></span + ><span class="hs-pragma" + >{-# LANGUAGE ScopedTypeVariables #-}</span ><span > </span @@ -30,6 +32,11 @@ </span ><span id="line-5" ></span + ><span + > +</span + ><span id="line-6" + ></span ><span class="hs-keyword" >module</span ><span @@ -43,17 +50,17 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span id="" ><span class="annot" @@ -102,7 +109,7 @@ ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span id="foo" ><span class="annot" @@ -132,12 +139,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span class="annot" ><a href="Polymorphism.html#foo%27" @@ -200,7 +207,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span id="foo%27" ><span class="annot" @@ -230,12 +237,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span id="" ><span id="" @@ -300,7 +307,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span id="bar" ><span class="annot" @@ -330,12 +337,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span class="annot" ><a href="Polymorphism.html#bar%27" @@ -422,7 +429,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span id="bar%27" ><span class="annot" @@ -452,12 +459,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span id="" ><span id="" @@ -552,7 +559,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span id="baz" ><span class="annot" @@ -582,12 +589,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span class="annot" ><a href="Polymorphism.html#baz%27" @@ -704,7 +711,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span id="baz%27" ><span class="annot" @@ -734,12 +741,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span id="" ><span class="annot" @@ -820,7 +827,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span id="quux" ><span class="annot" @@ -889,12 +896,12 @@ forall a. a -> a ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ><span class="annot" ><a href="Polymorphism.html#quux%27" @@ -989,7 +996,7 @@ forall a. a -> a ><span > </span - ><span id="line-30" + ><span id="line-31" ></span ><span id="quux%27" ><span class="annot" @@ -1058,17 +1065,17 @@ forall a. a -> a ><span > </span - ><span id="line-31" + ><span id="line-32" ></span ><span > </span - ><span id="line-32" + ><span id="line-33" ></span ><span > </span - ><span id="line-33" + ><span id="line-34" ></span ><span id="" ><span class="annot" @@ -1135,7 +1142,7 @@ forall a. a -> a ><span > </span - ><span id="line-34" + ><span id="line-35" ></span ><span id="num" ><span class="annot" @@ -1165,12 +1172,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-35" + ><span id="line-36" ></span ><span > </span - ><span id="line-36" + ><span id="line-37" ></span ><span class="annot" ><a href="Polymorphism.html#num%27" @@ -1251,7 +1258,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-37" + ><span id="line-38" ></span ><span id="num%27" ><span class="annot" @@ -1281,12 +1288,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-38" + ><span id="line-39" ></span ><span > </span - ><span id="line-39" + ><span id="line-40" ></span ><span id="" ><span id="" @@ -1397,7 +1404,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-40" + ><span id="line-41" ></span ><span id="eq" ><span class="annot" @@ -1427,12 +1434,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-41" + ><span id="line-42" ></span ><span > </span - ><span id="line-42" + ><span id="line-43" ></span ><span class="annot" ><a href="Polymorphism.html#eq%27" @@ -1565,7 +1572,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-43" + ><span id="line-44" ></span ><span id="eq%27" ><span class="annot" @@ -1595,12 +1602,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-44" + ><span id="line-45" ></span ><span > </span - ><span id="line-45" + ><span id="line-46" ></span ><span id="" ><span id="" @@ -1689,7 +1696,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-46" + ><span id="line-47" ></span ><span id="mon" ><span class="annot" @@ -1719,12 +1726,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-47" + ><span id="line-48" ></span ><span > </span - ><span id="line-48" + ><span id="line-49" ></span ><span class="annot" ><a href="Polymorphism.html#mon%27" @@ -1835,7 +1842,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-49" + ><span id="line-50" ></span ><span id="mon%27" ><span class="annot" @@ -1865,17 +1872,17 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-50" + ><span id="line-51" ></span ><span > </span - ><span id="line-51" + ><span id="line-52" ></span ><span > </span - ><span id="line-52" + ><span id="line-53" ></span ><span id="" ><span class="annot" @@ -1974,7 +1981,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-53" + ><span id="line-54" ></span ><span id="norf" ><span class="annot" @@ -2031,12 +2038,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-54" + ><span id="line-55" ></span ><span > </span - ><span id="line-55" + ><span id="line-56" ></span ><span class="annot" ><a href="Polymorphism.html#norf%27" @@ -2149,7 +2156,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-56" + ><span id="line-57" ></span ><span id="norf%27" ><span class="annot" @@ -2206,17 +2213,17 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-57" + ><span id="line-58" ></span ><span > </span - ><span id="line-58" + ><span id="line-59" ></span ><span > </span - ><span id="line-59" + ><span id="line-60" ></span ><span class="annot" ><a href="Polymorphism.html#plugh" @@ -2267,7 +2274,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-60" + ><span id="line-61" ></span ><span id="plugh" ><span class="annot" @@ -2323,12 +2330,12 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-61" + ><span id="line-62" ></span ><span > </span - ><span id="line-62" + ><span id="line-63" ></span ><span class="annot" ><a href="Polymorphism.html#thud" @@ -2431,7 +2438,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-63" + ><span id="line-64" ></span ><span id="thud" ><span class="annot" @@ -2477,7 +2484,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-64" + ><span id="line-65" ></span ><span > </span @@ -2548,7 +2555,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-65" + ><span id="line-66" ></span ><span > </span @@ -2557,7 +2564,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-66" + ><span id="line-67" ></span ><span > </span @@ -2641,7 +2648,7 @@ forall a. HasCallStack => a ><span > </span - ><span id="line-67" + ><span id="line-68" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/PositionPragmas.html b/hypsrc-test/ref/src/PositionPragmas.html index 8ee123fa..3fef6c73 100644 --- a/hypsrc-test/ref/src/PositionPragmas.html +++ b/hypsrc-test/ref/src/PositionPragmas.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -19,12 +26,12 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span class="hs-pragma" >{-# LINE 8 "hypsrc-test/src/PositionPragmas.hs" #-}</span diff --git a/hypsrc-test/ref/src/Quasiquoter.html b/hypsrc-test/ref/src/Quasiquoter.html index 867c78ca..53c05de1 100644 --- a/hypsrc-test/ref/src/Quasiquoter.html +++ b/hypsrc-test/ref/src/Quasiquoter.html @@ -6,7 +6,14 @@ ></head ><body ><pre - ><span class="hs-keyword" + ><span class="hs-pragma" + >{-# LANGUAGE Haskell2010 #-}</span + ><span + > +</span + ><span id="line-2" + ></span + ><span class="hs-keyword" >module</span ><span > </span @@ -35,12 +42,12 @@ ><span > </span - ><span id="line-2" + ><span id="line-3" ></span ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span class="hs-keyword" >import</span @@ -53,7 +60,7 @@ ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="hs-keyword" >import</span @@ -66,19 +73,19 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span class="hs-comment" >-- | Quoter for constructing multiline string literals</span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span class="annot" ><a href="Quasiquoter.html#string" @@ -99,7 +106,7 @@ ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span id="string" ><span class="annot" @@ -125,7 +132,7 @@ ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span > </span @@ -195,7 +202,7 @@ forall b c a. (b -> c) -> (a -> b) -> a -> c ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span @@ -229,7 +236,7 @@ forall a. String -> Q a ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span @@ -263,7 +270,7 @@ forall a. String -> Q a ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span > </span @@ -297,7 +304,7 @@ forall a. String -> Q a ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span > </span @@ -306,7 +313,7 @@ forall a. String -> Q a ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span > </span @@ -315,7 +322,7 @@ forall a. String -> Q a ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span > </span @@ -358,7 +365,7 @@ forall a. String -> Q a ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span @@ -408,7 +415,7 @@ forall (m :: * -> *) a. MonadFail m => String -> m a ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html index 7c5b2ff7..9adf02de 100644 --- a/hypsrc-test/ref/src/Records.html +++ b/hypsrc-test/ref/src/Records.html @@ -7,19 +7,21 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE NamedFieldPuns #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span ><span class="hs-pragma" - >{-# LANGUAGE RecordWildCards #-}</span + >{-# LANGUAGE NamedFieldPuns #-}</span ><span > </span ><span id="line-3" ></span + ><span class="hs-pragma" + >{-# LANGUAGE RecordWildCards #-}</span ><span > </span @@ -30,6 +32,11 @@ </span ><span id="line-5" ></span + ><span + > +</span + ><span id="line-6" + ></span ><span class="hs-keyword" >module</span ><span @@ -43,17 +50,17 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span class="hs-keyword" >data</span @@ -84,7 +91,7 @@ ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span > </span @@ -118,7 +125,7 @@ ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span @@ -152,7 +159,7 @@ ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span @@ -161,17 +168,17 @@ ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span class="annot" ><a href="Records.html#point" @@ -214,7 +221,7 @@ ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span id="point" ><span class="annot" @@ -330,17 +337,17 @@ ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span class="annot" ><a href="Records.html#lengthSqr" @@ -373,7 +380,7 @@ ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span id="lengthSqr" ><span class="annot" @@ -545,12 +552,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span class="annot" ><a href="Records.html#lengthSqr%27" @@ -583,7 +590,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span id="lengthSqr%27" ><span class="annot" @@ -729,17 +736,17 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span class="annot" ><a href="Records.html#translateX" @@ -794,7 +801,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span id="translateX" ><span class="annot" @@ -917,7 +924,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span id="translateY" ><span class="annot" @@ -1040,12 +1047,12 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ><span class="annot" ><a href="Records.html#translate" @@ -1100,7 +1107,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-30" + ><span id="line-31" ></span ><span id="translate" ><span class="annot" @@ -1159,7 +1166,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-31" + ><span id="line-32" ></span ><span > </span @@ -1186,7 +1193,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-32" + ><span id="line-33" ></span ><span > </span @@ -1195,7 +1202,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-33" + ><span id="line-34" ></span ><span > </span @@ -1264,7 +1271,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-34" + ><span id="line-35" ></span ><span > </span @@ -1430,7 +1437,7 @@ forall a. Num a => a -> a -> a ><span > </span - ><span id="line-35" + ><span id="line-36" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html b/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html index 38dfb97e..9c06e8e0 100644 --- a/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html +++ b/hypsrc-test/ref/src/TemplateHaskellQuasiquotes.html @@ -7,17 +7,24 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE TemplateHaskell #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span + ><span class="hs-pragma" + >{-# LANGUAGE TemplateHaskell #-}</span ><span > </span ><span id="line-3" ></span + ><span + > +</span + ><span id="line-4" + ></span ><span class="hs-keyword" >module</span ><span @@ -31,12 +38,12 @@ ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span class="hs-keyword" >import</span @@ -49,12 +56,12 @@ ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span class="annot" ><a href="TemplateHaskellQuasiquotes.html#aDecl" @@ -75,7 +82,7 @@ ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span id="aDecl" ><span class="annot" @@ -99,7 +106,7 @@ ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span > </span @@ -144,7 +151,7 @@ ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span @@ -169,7 +176,7 @@ ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span > </span @@ -178,12 +185,12 @@ ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span class="annot" ><a href="TemplateHaskellQuasiquotes.html#aPattern" @@ -204,7 +211,7 @@ ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span id="aPattern" ><span class="annot" @@ -228,7 +235,7 @@ ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span > </span @@ -241,7 +248,7 @@ ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span @@ -254,7 +261,7 @@ ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span > </span @@ -277,7 +284,7 @@ ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span > </span @@ -304,7 +311,7 @@ ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span > </span @@ -313,7 +320,7 @@ ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span > </span @@ -322,12 +329,12 @@ ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span class="annot" ><a href="TemplateHaskellQuasiquotes.html#aNumberPattern" @@ -348,7 +355,7 @@ ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span id="aNumberPattern" ><span class="annot" @@ -372,7 +379,7 @@ ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span > </span @@ -389,7 +396,7 @@ ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span > </span @@ -398,12 +405,12 @@ ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span class="annot" ><a href="TemplateHaskellQuasiquotes.html#anExpression" @@ -434,7 +441,7 @@ ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span id="anExpression" ><span class="annot" @@ -458,7 +465,7 @@ ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ><span > </span @@ -495,7 +502,7 @@ ><span > </span - ><span id="line-30" + ><span id="line-31" ></span ><span > </span @@ -504,7 +511,7 @@ ><span > </span - ><span id="line-31" + ><span id="line-32" ></span ><span id="anExpression2" ><span class="annot" @@ -552,12 +559,12 @@ ><span > </span - ><span id="line-32" + ><span id="line-33" ></span ><span > </span - ><span id="line-33" + ><span id="line-34" ></span ><span class="annot" ><a href="TemplateHaskellQuasiquotes.html#aType" @@ -578,7 +585,7 @@ ><span > </span - ><span id="line-34" + ><span id="line-35" ></span ><span id="aType" ><span class="annot" @@ -602,7 +609,7 @@ ><span > </span - ><span id="line-35" + ><span id="line-36" ></span ><span > </span @@ -629,7 +636,7 @@ ><span > </span - ><span id="line-36" + ><span id="line-37" ></span ><span > </span @@ -638,22 +645,22 @@ ><span > </span - ><span id="line-37" + ><span id="line-38" ></span ><span > </span - ><span id="line-38" + ><span id="line-39" ></span ><span > </span - ><span id="line-39" + ><span id="line-40" ></span ><span > </span - ><span id="line-40" + ><span id="line-41" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/TemplateHaskellSplices.html b/hypsrc-test/ref/src/TemplateHaskellSplices.html index 63b0025d..db43c818 100644 --- a/hypsrc-test/ref/src/TemplateHaskellSplices.html +++ b/hypsrc-test/ref/src/TemplateHaskellSplices.html @@ -7,12 +7,19 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE TemplateHaskell #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span + ><span class="hs-pragma" + >{-# LANGUAGE TemplateHaskell #-}</span + ><span + > +</span + ><span id="line-3" + ></span ><span class="hs-keyword" >module</span ><span @@ -26,12 +33,12 @@ ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="hs-keyword" >import</span @@ -46,12 +53,12 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span class="hs-special" >$</span @@ -66,12 +73,12 @@ ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span id="foo" ><span class="annot" @@ -111,7 +118,7 @@ forall a. a -> a ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/Types.html b/hypsrc-test/ref/src/Types.html index 835fafb0..641ba512 100644 --- a/hypsrc-test/ref/src/Types.html +++ b/hypsrc-test/ref/src/Types.html @@ -7,12 +7,14 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE TypeFamilies #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span + ><span class="hs-pragma" + >{-# LANGUAGE TypeFamilies #-}</span ><span > </span @@ -23,6 +25,11 @@ </span ><span id="line-4" ></span + ><span + > +</span + ><span id="line-5" + ></span ><span class="hs-keyword" >module</span ><span @@ -36,17 +43,17 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span > </span - ><span id="line-7" + ><span id="line-8" ></span ><span class="hs-keyword" >data</span @@ -91,12 +98,12 @@ ><span > </span - ><span id="line-8" + ><span id="line-9" ></span ><span > </span - ><span id="line-9" + ><span id="line-10" ></span ><span class="hs-keyword" >newtype</span @@ -133,12 +140,12 @@ ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ><span > </span - ><span id="line-11" + ><span id="line-12" ></span ><span class="hs-keyword" >type</span @@ -181,7 +188,7 @@ ><span > </span - ><span id="line-12" + ><span id="line-13" ></span ><span class="hs-keyword" >type</span @@ -224,17 +231,17 @@ ><span > </span - ><span id="line-13" + ><span id="line-14" ></span ><span > </span - ><span id="line-14" + ><span id="line-15" ></span ><span > </span - ><span id="line-15" + ><span id="line-16" ></span ><span class="hs-keyword" >data</span @@ -275,12 +282,12 @@ ><span > </span - ><span id="line-16" + ><span id="line-17" ></span ><span > </span - ><span id="line-17" + ><span id="line-18" ></span ><span class="hs-keyword" >data</span @@ -347,7 +354,7 @@ ><span > </span - ><span id="line-18" + ><span id="line-19" ></span ><span class="hs-keyword" >data</span @@ -414,17 +421,17 @@ ><span > </span - ><span id="line-19" + ><span id="line-20" ></span ><span > </span - ><span id="line-20" + ><span id="line-21" ></span ><span > </span - ><span id="line-21" + ><span id="line-22" ></span ><span class="hs-keyword" >type</span @@ -465,12 +472,12 @@ ><span > </span - ><span id="line-22" + ><span id="line-23" ></span ><span > </span - ><span id="line-23" + ><span id="line-24" ></span ><span class="hs-keyword" >type</span @@ -533,7 +540,7 @@ ><span > </span - ><span id="line-24" + ><span id="line-25" ></span ><span class="hs-keyword" >type</span @@ -596,17 +603,17 @@ ><span > </span - ><span id="line-25" + ><span id="line-26" ></span ><span > </span - ><span id="line-26" + ><span id="line-27" ></span ><span > </span - ><span id="line-27" + ><span id="line-28" ></span ><span class="annot" ><a href="Types.html#norf1" @@ -655,7 +662,7 @@ ><span > </span - ><span id="line-28" + ><span id="line-29" ></span ><span id="norf1" ><span class="annot" @@ -725,7 +732,7 @@ ><span > </span - ><span id="line-29" + ><span id="line-30" ></span ><span class="annot" ><a href="Types.html#norf1" @@ -790,12 +797,12 @@ ><span > </span - ><span id="line-30" + ><span id="line-31" ></span ><span > </span - ><span id="line-31" + ><span id="line-32" ></span ><span class="annot" ><a href="Types.html#norf2" @@ -844,7 +851,7 @@ ><span > </span - ><span id="line-32" + ><span id="line-33" ></span ><span id="norf2" ><span class="annot" @@ -914,7 +921,7 @@ ><span > </span - ><span id="line-33" + ><span id="line-34" ></span ><span class="annot" ><a href="Types.html#norf2" @@ -979,17 +986,17 @@ ><span > </span - ><span id="line-34" + ><span id="line-35" ></span ><span > </span - ><span id="line-35" + ><span id="line-36" ></span ><span > </span - ><span id="line-36" + ><span id="line-37" ></span ><span class="annot" ><a href="Types.html#norf1%27" @@ -1038,7 +1045,7 @@ ><span > </span - ><span id="line-37" + ><span id="line-38" ></span ><span id="norf1%27" ><span class="annot" @@ -1098,7 +1105,7 @@ ><span > </span - ><span id="line-38" + ><span id="line-39" ></span ><span class="annot" ><a href="Types.html#norf1%27" @@ -1153,12 +1160,12 @@ ><span > </span - ><span id="line-39" + ><span id="line-40" ></span ><span > </span - ><span id="line-40" + ><span id="line-41" ></span ><span class="annot" ><a href="Types.html#norf2%27" @@ -1207,7 +1214,7 @@ ><span > </span - ><span id="line-41" + ><span id="line-42" ></span ><span id="norf2%27" ><span class="annot" @@ -1267,7 +1274,7 @@ ><span > </span - ><span id="line-42" + ><span id="line-43" ></span ><span class="annot" ><a href="Types.html#norf2%27" @@ -1322,7 +1329,7 @@ ><span > </span - ><span id="line-43" + ><span id="line-44" ></span ></pre ></body diff --git a/hypsrc-test/ref/src/UsingQuasiquotes.html b/hypsrc-test/ref/src/UsingQuasiquotes.html index ca48775d..1e7aef2c 100644 --- a/hypsrc-test/ref/src/UsingQuasiquotes.html +++ b/hypsrc-test/ref/src/UsingQuasiquotes.html @@ -7,12 +7,19 @@ ><body ><pre ><span class="hs-pragma" - >{-# LANGUAGE QuasiQuotes #-}</span + >{-# LANGUAGE Haskell2010 #-}</span ><span > </span ><span id="line-2" ></span + ><span class="hs-pragma" + >{-# LANGUAGE QuasiQuotes #-}</span + ><span + > +</span + ><span id="line-3" + ></span ><span class="hs-keyword" >module</span ><span @@ -26,12 +33,12 @@ ><span > </span - ><span id="line-3" + ><span id="line-4" ></span ><span > </span - ><span id="line-4" + ><span id="line-5" ></span ><span class="hs-keyword" >import</span @@ -46,12 +53,12 @@ ><span > </span - ><span id="line-5" + ><span id="line-6" ></span ><span > </span - ><span id="line-6" + ><span id="line-7" ></span ><span id="baz" ><span class="annot" @@ -96,7 +103,7 @@ forall a. [a] -> [a] -> [a] ><span > </span - ><span id="line-10" + ><span id="line-11" ></span ></pre ></body diff --git a/hypsrc-test/src/Bug1091.hs b/hypsrc-test/src/Bug1091.hs index f0cea033..013acbbc 100644 --- a/hypsrc-test/src/Bug1091.hs +++ b/hypsrc-test/src/Bug1091.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE CPP #-} module Bug1091 where diff --git a/hypsrc-test/src/CPP.hs b/hypsrc-test/src/CPP.hs index f00ce031..59cb6034 100644 --- a/hypsrc-test/src/CPP.hs +++ b/hypsrc-test/src/CPP.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE CPP #-} module CPP where diff --git a/hypsrc-test/src/Classes.hs b/hypsrc-test/src/Classes.hs index b3c3f785..0f2416de 100644 --- a/hypsrc-test/src/Classes.hs +++ b/hypsrc-test/src/Classes.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Classes where diff --git a/hypsrc-test/src/Constructors.hs b/hypsrc-test/src/Constructors.hs index 8cb46535..66260ee8 100644 --- a/hypsrc-test/src/Constructors.hs +++ b/hypsrc-test/src/Constructors.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Constructors where diff --git a/hypsrc-test/src/Identifiers.hs b/hypsrc-test/src/Identifiers.hs index 173c3ba7..72853a4a 100644 --- a/hypsrc-test/src/Identifiers.hs +++ b/hypsrc-test/src/Identifiers.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Identifiers where diff --git a/hypsrc-test/src/LinkingIdentifiers.hs b/hypsrc-test/src/LinkingIdentifiers.hs index 4fff9776..b195c2c6 100644 --- a/hypsrc-test/src/LinkingIdentifiers.hs +++ b/hypsrc-test/src/LinkingIdentifiers.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} -- Tests that the identifers/operators are properly linked even when: -- -- * backquoted, parenthesized, vanilla diff --git a/hypsrc-test/src/Literals.hs b/hypsrc-test/src/Literals.hs index 997b6615..d862bf87 100644 --- a/hypsrc-test/src/Literals.hs +++ b/hypsrc-test/src/Literals.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Literals where diff --git a/hypsrc-test/src/Operators.hs b/hypsrc-test/src/Operators.hs index 8e86ab0b..1dcb8856 100644 --- a/hypsrc-test/src/Operators.hs +++ b/hypsrc-test/src/Operators.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Operators where diff --git a/hypsrc-test/src/Polymorphism.hs b/hypsrc-test/src/Polymorphism.hs index 3f0103bf..dfcb37fa 100644 --- a/hypsrc-test/src/Polymorphism.hs +++ b/hypsrc-test/src/Polymorphism.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} diff --git a/hypsrc-test/src/PositionPragmas.hs b/hypsrc-test/src/PositionPragmas.hs index 907316fd..e01334ed 100644 --- a/hypsrc-test/src/PositionPragmas.hs +++ b/hypsrc-test/src/PositionPragmas.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module PositionPragmas where {-# LINE 8 "hypsrc-test/src/PositionPragmas.hs" #-} diff --git a/hypsrc-test/src/Quasiquoter.hs b/hypsrc-test/src/Quasiquoter.hs index d0a46c33..48f1b155 100644 --- a/hypsrc-test/src/Quasiquoter.hs +++ b/hypsrc-test/src/Quasiquoter.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} module Quasiquoter ( string ) where import Language.Haskell.TH.Quote diff --git a/hypsrc-test/src/Records.hs b/hypsrc-test/src/Records.hs index 40a01121..ae5a0c55 100644 --- a/hypsrc-test/src/Records.hs +++ b/hypsrc-test/src/Records.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RecordWildCards #-} diff --git a/hypsrc-test/src/TemplateHaskellQuasiquotes.hs b/hypsrc-test/src/TemplateHaskellQuasiquotes.hs index 6d404921..7fafc7aa 100644 --- a/hypsrc-test/src/TemplateHaskellQuasiquotes.hs +++ b/hypsrc-test/src/TemplateHaskellQuasiquotes.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TemplateHaskell #-} module TemplateHaskellQuasiquotes where diff --git a/hypsrc-test/src/TemplateHaskellSplices.hs b/hypsrc-test/src/TemplateHaskellSplices.hs index bbd3948e..f8a859a0 100644 --- a/hypsrc-test/src/TemplateHaskellSplices.hs +++ b/hypsrc-test/src/TemplateHaskellSplices.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TemplateHaskell #-} module TemplateHaskellSplices where diff --git a/hypsrc-test/src/Types.hs b/hypsrc-test/src/Types.hs index b63a825b..a0481e82 100644 --- a/hypsrc-test/src/Types.hs +++ b/hypsrc-test/src/Types.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE TypeFamilies #-} diff --git a/hypsrc-test/src/UsingQuasiquotes.hs b/hypsrc-test/src/UsingQuasiquotes.hs index 34872d4d..44da0c4b 100644 --- a/hypsrc-test/src/UsingQuasiquotes.hs +++ b/hypsrc-test/src/UsingQuasiquotes.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE Haskell2010 #-} {-# LANGUAGE QuasiQuotes #-} module UsingQuasiquotes where |