Update of /cvsroot/hoc/hoc/Samples/ExpressionParser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2948
Modified Files:
EPController.hs Selectors.hs
Log Message:
Renamed "evaluate" selector to "evaluteExpression" (to avoid conflicts with
existing Cocoa names)
Added ExpressionParser.nib file
Index: EPController.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/Samples/ExpressionParser/EPController.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EPController.hs 14 May 2004 15:34:31 -0000 1.1
+++ EPController.hs 16 May 2004 08:47:33 -0000 1.2
@@ -2,29 +2,34 @@
module EPController where
-import Cocoa hiding (parse, info_evaluate, ImpType_evaluate)
+import Cocoa hiding (parse)
import ExpressionParser
import Selectors
import Text.ParserCombinators.Parsec (parse)
+import GHC.Ptr
+import HOC.Base
+
$(declareClass "EPController" "NSObject")
$(exportClass "EPController" "ep_"
[ Outlet "expressionEntry" [t| NSTextField () |]
, Outlet "evaluation" [t| NSTextField () |]
- , InstanceMethod Selectors.info_evaluate
+ , InstanceMethod Selectors.info_evaluateExpression
]
)
obj #. var = obj # getIVar var
-ep_evaluate _ self = do
+ep_evaluateExpression _ self = do
expressionTextField <- (self #. _expressionEntry)
expression <- expressionTextField # stringValue >>= haskellString
evaluation <- self #. _evaluation
case (parse expr "" expression) of
Left err ->
- self #. _evaluation >>= setStringValue (toNSString "(error)")
+ self #. _evaluation >>=
+ setStringValue (toNSString $ "Error " ++ show err)
Right answer ->
- self #. _evaluation >>= setStringValue (toNSString $ show answer)
+ self #. _evaluation >>=
+ setStringValue (toNSString $ show answer)
Index: Selectors.hs
===================================================================
RCS file: /cvsroot/hoc/hoc/Samples/ExpressionParser/Selectors.hs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Selectors.hs 14 May 2004 15:34:31 -0000 1.1
+++ Selectors.hs 16 May 2004 08:47:33 -0000 1.2
@@ -4,5 +4,5 @@
import AppKit.NSButton
-$(declareSelector "evaluate:" [t| forall a. NSButton a -> IO () |])
+$(declareSelector "evaluateExpression:" [t| forall a. NSButton a -> IO () |])
|
