From 55c3a195c992bcc56d480976fa8a8b22cc03e1d7 Mon Sep 17 00:00:00 2001 From: justin Date: Sun, 21 Aug 2022 10:10:52 +0100 Subject: [PATCH] Remove some flat instances in an effort to allow compilation --- package.yaml | 2 +- src/Dodge/Data/Button.hs | 6 ++++-- src/Dodge/Data/CWorld.hs | 6 ++++-- src/Dodge/Data/Terminal.hs | 18 ++++++++++++------ src/Dodge/Data/WorldEffect.hs | 6 ++++-- src/Dodge/Menu/.OptionType.hs.swo | Bin 0 -> 12288 bytes src/Dodge/Save.hs | 25 +++++++++++++------------ 7 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 src/Dodge/Menu/.OptionType.hs.swo diff --git a/package.yaml b/package.yaml index f9d94af2b..796a53be9 100644 --- a/package.yaml +++ b/package.yaml @@ -131,7 +131,7 @@ benchmarks: - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 - -fllvm - - -optlo-O3 + #- -optlo-O3 main: Bench.hs source-dirs: bench diff --git a/src/Dodge/Data/Button.hs b/src/Dodge/Data/Button.hs index 65d3a832a..cf97076e8 100644 --- a/src/Dodge/Data/Button.hs +++ b/src/Dodge/Data/Button.hs @@ -44,7 +44,8 @@ data ButtonEvent , _boffEff :: WdWd } | ButtonAccessTerminal - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data Button = Button { _btPict :: ButtonDraw --Button -> SPic @@ -58,7 +59,8 @@ data Button = Button , _btName :: String , _btColor :: Color } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data ButtonState = BtOn | BtOff | BtNoLabel deriving (Eq, Ord, Show, Read, Generic, Flat) diff --git a/src/Dodge/Data/CWorld.hs b/src/Dodge/Data/CWorld.hs index d36cecd89..63b8560f8 100644 --- a/src/Dodge/Data/CWorld.hs +++ b/src/Dodge/Data/CWorld.hs @@ -187,7 +187,8 @@ data CWorld = CWorld , _cwTime :: CWTime , _cwGen :: CWGen } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data CWTime = CWTime { _maybeWorld :: Maybe' CWorld @@ -195,7 +196,8 @@ data CWTime = CWTime , _worldClock :: Int , _deathDelay :: Maybe Int } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data CWGen = CWGen diff --git a/src/Dodge/Data/Terminal.hs b/src/Dodge/Data/Terminal.hs index f2bcfb33d..971a719ce 100644 --- a/src/Dodge/Data/Terminal.hs +++ b/src/Dodge/Data/Terminal.hs @@ -28,7 +28,8 @@ data TerminalInput = TerminalInput data TerminalBootProgram = TerminalBootMempty | TerminalBootLines [TerminalLine] - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data Terminal = Terminal { _tmID :: Int @@ -48,7 +49,8 @@ data Terminal = Terminal , _tmCommandHistory :: [String] , _tmToggles :: M.Map String TerminalToggle } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data TerminalLineString = TerminalLineConst String Color deriving (Eq, Ord, Show, Read, Generic, Flat) @@ -72,7 +74,8 @@ data TerminalLine { _tlPause :: Int , _tlEffect :: TmWdWd --Terminal -> World -> World } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data TerminalToggle = TerminalToggle { _ttTriggerID :: Int @@ -92,7 +95,8 @@ data EffectArguments { _argType :: String , _argList :: M.Map String [TerminalLine] } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data TerminalCommandEffect = TerminalCommandArguments EffectArguments @@ -104,7 +108,8 @@ data TerminalCommandEffect | TerminalCommandEffectCommands | TerminalCommandEffectSingleCommand WdWd [String] | TerminalCommandEffectNone - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data TerminalCommand = TerminalCommand { _tcString :: String @@ -112,7 +117,8 @@ data TerminalCommand = TerminalCommand , _tcHelp :: String , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments } - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) makeLenses ''TerminalInput makeLenses ''Terminal diff --git a/src/Dodge/Data/WorldEffect.hs b/src/Dodge/Data/WorldEffect.hs index 9f7e59f7f..a7bef292e 100644 --- a/src/Dodge/Data/WorldEffect.hs +++ b/src/Dodge/Data/WorldEffect.hs @@ -32,7 +32,8 @@ data WdWd | WdWdNegateTrig Int | WdWdFromItixCrixWdWd Int Int ItCrWdWd | WdWdFromItCrixWdWd Item Int ItCrWdWd - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) data WdP2 = WdP2Const Point2 @@ -74,7 +75,8 @@ data TmWdWd | TmWdWdfromWdWd WdWd | TmWdWdTermSound SoundID | TmWdWdDoDeathTriggers - deriving (Eq, Show, Read, Generic, Flat) + deriving (Eq, Show, Read, Generic) + --hderiving (Eq, Show, Read, Generic, Flat) deriveJSON defaultOptions ''ItCrWdWd deriveJSON defaultOptions ''WdWd diff --git a/src/Dodge/Menu/.OptionType.hs.swo b/src/Dodge/Menu/.OptionType.hs.swo new file mode 100644 index 0000000000000000000000000000000000000000..0775703e00ad6f16dfd007fbc9c9fa0adf8599e9 GIT binary patch literal 12288 zcmeI2&u-H|5XPq*5rqm4oG1eUlt`?TQVyshJ@gN>h%}MXazY5#-Xx~>uJP_Rt)PYX zfFlQP<-~JDUwQ?>j^>FO1{aDMH$ zr+FU}U;<2l2`~XBzyz286JP=-fPhWM;1%_8YS_!g;W~C`9X|5H1egF5U;<2l2`~XB zzyz286JP>NfC>DE1pE--`x$_6oXpez|D)gkU(Nx1AnlRfkY1BIBuQE!&66fbpU(n( zBJGjhk)Dz+lO{>uDCbwwd(vCd4k@n_koaN(On?b60Vco%m;e)C0!)AjoJ0ah*Gts4 zC$oNJB-YWmAiymc1h%kV$Hd>7(@upHOd?g>La-gga#6X2w*I-FnZfenbM$Xw5u&x& zEkpDxSf5271$_V{{)TM3^@OIX2Se3VwRl2HMOJmU8%r#w&h*+rCZ!sMD_9P+G8SzG z3WvGN@?)2$Z8R6!Hj7kul+k8bHa*?Pvco4Ober>9b)qhM7%Nk$R1PP2KqKXN_u4F) zD3r3($!yE&@MN@g(!}?SN4S5)4tN+unJ+9wOT9+wmq_FIf(F45| zCY82-+oSRKc%MCj4G<-%&MX#l?p{9U?zM<}OQ#1T3%>QeH5F~j%*auQh}ulY-b1Nq zAU@HdqxZHi)1X#9F^_%vhDmrKO4w|zE;m=&C^|}uzMm Universe -> IO (Universe -> Maybe Universe) writeSaveSlot ss u = do putStrLn $ "Saving " ++ saveSlotPath ss createDirectoryIfMissing True "saveSlot" - BSS.writeFile (saveSlotPath ss) $ - flat - (u ^. uvWorld . cWorld) +-- BSS.writeFile (saveSlotPath ss) $ +-- flat +-- (u ^. uvWorld . cWorld) return Just readSaveSlot :: SaveSlot -> IO (Universe -> Maybe Universe) readSaveSlot ss = do fExists <- doesFileExist $ saveSlotPath ss - if fExists - then do - bsstr <- BSS.readFile $ saveSlotPath ss - let cwstr = unflat bsstr - case cwstr of - Left _ -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers - Right cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw - & uvScreenLayers .~ [] - else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers +-- if fExists +-- then do +-- bsstr <- BSS.readFile $ saveSlotPath ss +-- let cwstr = unflat bsstr +-- case cwstr of +-- Left _ -> putStrLn "loadSaveSlot failed to read saved file" >> return removescreenlayers +-- Right cw -> return $ \uv -> Just $ uv & uvWorld . cWorld .~ cw +-- & uvScreenLayers .~ [] +-- else putStrLn "loadSaveSlot failed to find saved file" >> return removescreenlayers + return Just where removescreenlayers = Just . (uvScreenLayers .~ [])