Commenting out #include <cassert> too

kaitanie · Nov 14, 2011 · 1ac1e54 · 1ac1e54
1 parent 42501fc
commit 1ac1e54
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/G4Release.hs b/src/G4Release.hs
@@ -27,7 +27,7 @@ data G4Module = G4Module {
 releaseG4 :: GitRepo -> FilePath -> [G4Module] -> IO ()
 releaseG4 repo targetdir modules = do
 --  let transformFn code = (useG4Types code) >>= (appendRevisionInfo repo) >>= (appendLicense licenseBoilerplate)
-  let transformFn code = (useG4Types code) >>= appendDefines >>= (appendRevisionInfo repo) >>= (appendLicense licenseBoilerplate)
+  let transformFn code = (useG4Types code) >>= disableAssertions >>= appendDefines >>= (appendRevisionInfo repo) >>= (appendLicense licenseBoilerplate)
 --  let transformFn code = (appendDefines code) >>= (appendRevisionInfo repo) >>= (appendLicense licenseBoilerplate)
       releaseFn = releaseModule targetdir transformFn
   mapM_ releaseFn modules

diff --git a/src/SedRunner.hs b/src/SedRunner.hs
@@ -1,5 +1,6 @@
 module SedRunner (
-  useG4Types
+  useG4Types,
+  disableAssertions
   ) where
 
 import System.IO
@@ -11,6 +12,7 @@ data SedCommand = SedIntToG4Int
                 | SedDoubleToG4Double
                 | SedBoolToG4Bool
                 | SedCommentAsserts
+                | SedCommentIncludeCassert
                 | SedFixG4G4
                 | SedFixUnsignedG4Int
                 | SedFixG4boolalpha
@@ -30,6 +32,7 @@ sedCommandArgs SedFloatToG4Float = toG4TypeRegexp "float"
 sedCommandArgs SedDoubleToG4Double = toG4TypeRegexp "double"
 sedCommandArgs SedBoolToG4Bool = toG4TypeRegexp "bool"
 sedCommandArgs SedCommentAsserts = ["s/^ *assert/\\/\\/ assert/g"]
+sedCommandArgs SedCommentIncludeCassert = ["s/#include \\+<cassert>/\\/\\/ #include <cassert>/g"]
 sedCommandArgs SedFixG4G4 = ["s/G4G4/G4/g"]
 sedCommandArgs SedFixUnsignedG4Int = ["s/unsigned\\ G4int/unsigned\\ int/g"]
 sedCommandArgs SedFixG4boolalpha = ["s/G4boolalpha/boolalpha/g"]
@@ -49,6 +52,12 @@ useG4Bool = runSed SedBoolToG4Bool
 commentAsserts :: String -> IO String
 commentAsserts = runSed SedCommentAsserts
 
+commentIncludeCassert :: String -> IO String
+commentIncludeCassert = runSed SedCommentIncludeCassert
+
+disableAssertions :: String -> IO String
+disableAssertions code = (commentAsserts code) >>= commentIncludeCassert
+
 fixG4G4 :: String -> IO String
 fixG4G4 = runSed SedFixG4G4