Some jugling with module and JS functions

UU-ComputerScience · Oct 19, 2011 · abf2740 · abf2740
1 parent 15a0738
commit abf2740
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/tests/Makefile b/tests/Makefile
@@ -1,4 +1,4 @@
-FLAGS = -tjscript --dump-core-stages=1 --dump-grin-stages=1 -O1,2 --gen-trace=1
+FLAGS = -tjscript --dump-core-stages=1 --dump-grin-stages=1 -O1,2 --gen-trace=1 --import-path=../../../uhc-jscript/src
 
 ifndef PROJECT
   PROJECT = $(patsubst %.hs, %, $(wildcard *.hs))

diff --git a/uhc-jscript/src/Language/UHC/JScript/Assorted.hs b/uhc-jscript/src/Language/UHC/JScript/Assorted.hs
@@ -1,7 +1,11 @@
 module Language.UHC.JScript.Assorted where
 
 import Language.UHC.JScript.ECMA.String
+import Language.UHC.JScript.Types
+import Language.UHC.JScript.Primitives
 
-foreign import jscript "alert(%*)"
-  alert :: JSString -> IO ()
+alert :: String -> IO ()
+alert = _alert . toJS
 
+foreign import jscript "alert(%*)"
+  _alert :: JSString -> IO ()
diff --git a/uhc-jscript/src/Language/UHC/JScript/ECMA/Expressions.hs b/uhc-jscript/src/Language/UHC/JScript/ECMA/Expressions.hs
@@ -1,6 +1,11 @@
 module Language.UHC.JScript.ECMA.Expressions where
 
-foreign import jscript "typeof(%*)"
-  typeof :: a -> JSString
+import Language.UHC.JScript.ECMA.String
+import Language.UHC.JScript.Types
+import Language.UHC.JScript.Primitives
 
+typeof :: a -> String
+typeof = fromJS . _typeof
 
+foreign import jscript "typeof(%*)"
+  _typeof :: a -> JSString