From 22120d44abc2e7b864dd19692d6577f9fe41c84d Mon Sep 17 00:00:00 2001 From: Ingo60 Date: Thu, 20 Aug 2015 00:43:02 +0200 Subject: [PATCH] Revert "restore backwards compatibility after changes for #165" This reverts commit 3f59987b4366e9aa86f2b1ac603f8bc568408782. --- frege/compiler/types/Packs.fr | 5 ++--- frege/compiler/types/Targets.fr | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/frege/compiler/types/Packs.fr b/frege/compiler/types/Packs.fr index 8a42cd83..486e67b2 100644 --- a/frege/compiler/types/Packs.fr +++ b/frege/compiler/types/Packs.fr @@ -113,9 +113,8 @@ magicPack nm = nm --- > unmagicPack . magicPack = id --- The following should hold for package names that start with "frege.c" --- > magicPack . unmagicPack = id -unmagicPack s - | Just m ← s =~ ´^frege\.(.)(.*)´, - Just c <- m.group 1, Just rest <- m.group 2, +unmagicPack (m~´^frege\.(.)(.*)´) + | Just c <- m.group 1, Just rest <- m.group 2, not (c.charAt 0).isUpperCase = c.toUpperCase ++ rest unmagicPack nm = nm diff --git a/frege/compiler/types/Targets.fr b/frege/compiler/types/Targets.fr index 08b68a40..f44d1323 100644 --- a/frege/compiler/types/Targets.fr +++ b/frege/compiler/types/Targets.fr @@ -5,7 +5,7 @@ module frege.compiler.types.Targets where data Target = Target {!major, !minor :: Int } where --- decode a target specification decode ∷ String → Maybe Target - decode s | Just m ← s =~ ´^(\d+)\.(\d+)$´ = do + decode (m~´^(\d+)\.(\d+)$´) = do maj ← m.group 1 min ← m.group 2 return (Target maj.atoi min.atoi)