diff options
| author | Roger Meier <roger@apache.org> | 2014-05-14 00:49:41 +0200 |
|---|---|---|
| committer | Roger Meier <roger@apache.org> | 2014-05-14 00:49:41 +0200 |
| commit | 303eb1b4f0ada3b6be45625beb6020a757a2f429 (patch) | |
| tree | 0ef6b88a11aac6d65c27c5fdd6eef2f2b85f7ab2 /compiler/cpp/src/generate/t_hs_generator.cc | |
| parent | 73b58a24699eb6b9d43ad05f8a19cd084979c31a (diff) | |
| download | thrift-303eb1b4f0ada3b6be45625beb6020a757a2f429.tar.gz | |
THRIFT-2401 Haskell tutorial compiles
Patch: John Chee & Roger Meier
includes minifix from:
THRIFT-2453 haskell tutorial: fix up division by 0 example
Diffstat (limited to 'compiler/cpp/src/generate/t_hs_generator.cc')
| -rw-r--r-- | compiler/cpp/src/generate/t_hs_generator.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/cpp/src/generate/t_hs_generator.cc b/compiler/cpp/src/generate/t_hs_generator.cc index bbfaba566..d52088b4f 100644 --- a/compiler/cpp/src/generate/t_hs_generator.cc +++ b/compiler/cpp/src/generate/t_hs_generator.cc @@ -249,7 +249,7 @@ string t_hs_generator::hs_imports() { " (.), (&&), (||), (==), (++), ($), (-) )\n" "\n" "import Control.Exception\n" - "import Data.ByteString.Lazy\n" + "import qualified Data.ByteString.Lazy as BL\n" "import Data.Hashable\n" "import Data.Int\n" "import Data.Text.Lazy ( Text )\n" @@ -1472,7 +1472,7 @@ string t_hs_generator::render_hs_type(t_type* type, bool needs_parens) { t_base_type::t_base tbase = ((t_base_type*)type)->get_base(); switch (tbase) { case t_base_type::TYPE_VOID: return "()"; - case t_base_type::TYPE_STRING: return (((t_base_type*)type)->is_binary() ? "ByteString" : "Text"); + case t_base_type::TYPE_STRING: return (((t_base_type*)type)->is_binary() ? "BL.ByteString" : "Text"); case t_base_type::TYPE_BOOL: return "Bool"; case t_base_type::TYPE_BYTE: return "Int8"; case t_base_type::TYPE_I16: return "Int16"; |