THRIFT-2641 Improvements to Haskell Compiler/Libraries
- test/test.sh integration
- add json and compact protocol
This closes #175
Signed-off-by: Roger Meier <roger@apache.org>
diff --git a/tutorial/hs/HaskellClient.hs b/tutorial/hs/HaskellClient.hs
index 18d72ad..bd29df0 100644
--- a/tutorial/hs/HaskellClient.hs
+++ b/tutorial/hs/HaskellClient.hs
@@ -48,27 +48,27 @@
printf "1+1=%d\n" sum
- let work = Work { f_Work_op = Just DIVIDE,
- f_Work_num1 = Just 1,
- f_Work_num2 = Just 0,
- f_Work_comment = Nothing
+ let work = Work { work_op = DIVIDE,
+ work_num1 = 1,
+ work_num2 = 0,
+ work_comment = Nothing
}
Control.Exception.catch (printf "1/0=%d\n" =<< Client.calculate client 1 work)
(\e -> printf "InvalidOperation %s\n" (show (e :: InvalidOperation)))
- let work = Work { f_Work_op = Just SUBTRACT,
- f_Work_num1 = Just 15,
- f_Work_num2 = Just 10,
- f_Work_comment = Nothing
+ let work = Work { work_op = SUBTRACT,
+ work_num1 = 15,
+ work_num2 = 10,
+ work_comment = Nothing
}
diff <- Client.calculate client 1 work
printf "15-10=%d\n" diff
log <- SClient.getStruct client 1
- printf "Check log: %s\n" $ fromJust $ unpack `fmap` f_SharedStruct_value log
+ printf "Check log: %s\n" $ unpack $ sharedStruct_value log
-- Close!
tClose transport