# HG changeset patch # User koda # Date 1352408179 -3600 # Node ID 259231ebf099b5ba2773613e9c66950ee06e4ebc # Parent 02f36c3e7f6ccba1ba81030ce6a265e8fe76aa06 well this was silly diff -r 02f36c3e7f6c -r 259231ebf099 tools/pas2c/CMakeLists.txt --- a/tools/pas2c/CMakeLists.txt Wed Nov 07 18:04:27 2012 +0000 +++ b/tools/pas2c/CMakeLists.txt Thu Nov 08 21:56:19 2012 +0100 @@ -1,21 +1,22 @@ set(pas2c_sources - Main.hs - PascalBasics.hs - PascalParser.hs - PascalPreprocessor.hs - PascalUnitSyntaxTree.hs - pas2c.hs - ) + Main.hs + PascalBasics.hs + PascalParser.hs + PascalPreprocessor.hs + PascalUnitSyntaxTree.hs + pas2c.hs + ) set(pas2c_main ${hedgewars_SOURCE_DIR}/tools/pas2c/Main.hs) set(ghc_flags - --make ${pas2c_main} - -i${hedgewars_SOURCE_DIR}/tools/pas2c/ - -o ${EXECUTABLE_OUTPUT_PATH}/pas2c${CMAKE_EXECUTABLE_SUFFIX} - -odir ${CMAKE_CURRENT_BINARY_DIR} - -hidir ${CMAKE_CURRENT_BINARY_DIR} - ${haskell_flags}) + --make ${pas2c_main} + -i${hedgewars_SOURCE_DIR}/tools/pas2c/ + -o ${EXECUTABLE_OUTPUT_PATH}/pas2c${CMAKE_EXECUTABLE_SUFFIX} + -odir ${CMAKE_CURRENT_BINARY_DIR} + -hidir ${CMAKE_CURRENT_BINARY_DIR} + ${haskell_flags} + ) add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/pas2c${CMAKE_EXECUTABLE_SUFFIX}" COMMAND "${ghc_executable}" diff -r 02f36c3e7f6c -r 259231ebf099 tools/pas2c/pas2c.hs --- a/tools/pas2c/pas2c.hs Wed Nov 07 18:04:27 2012 +0000 +++ b/tools/pas2c/pas2c.hs Thu Nov 08 21:56:19 2012 +0100 @@ -95,7 +95,7 @@ docToLower = text . map toLower . render pas2C :: String -> String -> String -> String -> IO () -pas2C fn inputPath alternateInputPath outputPath = do +pas2C fn inputPath outputPath alternateInputPath = do s <- flip execStateT initState $ f fn renderCFiles s outputPath where