From 3efdc3a8da642d5d76b2c3f10a22f0503f65456a Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Mon, 11 Feb 2019 12:27:41 -0500
Subject: Remove workaround for now-fixed Clang CPP bug (#1028)

Before LLVM 6.0.1 (or 10.0 on Apple LLVM), there was a bug where
lines that started with an octothorpe but turned out not
to lex like pragmas would have an extra line added after them.

Since this bug has been fixed upstream and that it doesn't have dire
consequences anyways, the workaround is not really worth it
anymore - we can just tell people to update their clang version (or re-structure
their pragma code).
---
 hypsrc-test/Main.hs            |  9 +--------
 hypsrc-test/src/ClangCppBug.hs | 21 ---------------------
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 hypsrc-test/src/ClangCppBug.hs

(limited to 'hypsrc-test')

diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
index 1963753d..f7614927 100644
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -20,18 +20,11 @@ checkConfig = CheckConfig
     , ccfgEqual = (==) `on` dumpXml
     }
   where
-    -- The whole point of the ClangCppBug is to demonstrate a situation where
-    -- line numbers may vary (and test that links still work). Consequently, we
-    -- strip out line numbers for this test case.
-    strip f | takeBaseName f == "ClangCppBug"
-            = stripAnchors' . stripLinks' . stripIds' . stripIds'' . stripFooter
-            | otherwise
-            = stripAnchors' . stripLinks' . stripIds' . stripFooter
+    strip _ = stripAnchors' . stripLinks' . stripIds' . stripFooter
     
     stripLinks' = stripLinksWhen $ \href -> "#local-" `isPrefixOf` href
     stripAnchors' = stripAnchorsWhen $ \name -> "local-" `isPrefixOf` name
     stripIds' = stripIdsWhen $ \name -> "local-" `isPrefixOf` name
-    stripIds'' = stripIdsWhen $ \name -> "line-" `isPrefixOf` name
 
 
 dirConfig :: DirConfig
diff --git a/hypsrc-test/src/ClangCppBug.hs b/hypsrc-test/src/ClangCppBug.hs
deleted file mode 100644
index 4b0bc35f..00000000
--- a/hypsrc-test/src/ClangCppBug.hs
+++ /dev/null
@@ -1,21 +0,0 @@
-{-# LANGUAGE CPP #-}
-module ClangCppBug where
-
-foo :: Int
-foo = 1
-
--- Clang doesn't mind these:
-#define BAX 2
-{-# INLINE bar #-}
-
-bar :: Int
-bar = 3
-
--- But it doesn't like this:
-{-# RULES
-"bar/qux" bar = qux
-"qux/foo" qux = foo
-  #-}
-
-qux :: Int
-qux = 88
-- 
cgit v1.2.3