Rename Language.Fay.FFI to Fay.FFI

Author: bergmark

fay.cabal

@@ -29,7 +29,7 @@ category:            Development
 build-type:          Custom
 cabal-version:       >=1.8
 data-files:          js/runtime.js
-                     src/Language/Fay/FFI.hs
+                     src/Fay/FFI.hs
 extra-source-files:  examples/ref.hs examples/alert.hs examples/console.hs examples/dom.hs
                      examples/tailrecursive.hs examples/data.hs examples/canvaswater.hs
                      examples/canvaswater.html examples/haskell.png
@@ -337,7 +337,7 @@ library
                      , Fay.Compiler.Debug
                      , Fay.Convert
                      , Fay.Types
-                     , Language.Fay.FFI
+                     , Fay.FFI
   other-modules:       Control.Monad.Extra
                      , Control.Monad.IO
                      , Data.List.Extra

js/runtime.js

@@ -214,7 +214,7 @@ function Fay$$fayToJs(type,fayObj){
   }
   else if(base == "defined") {
     fayObj = Fay$$_(fayObj);
-    if (fayObj instanceof Language.Fay.FFI._Undefined) {
+    if (fayObj instanceof Fay.FFI._Undefined) {
       jsObj = undefined;
     } else {
       jsObj = Fay$$fayToJs(args[0],fayObj.slot1);
@@ -223,7 +223,7 @@ function Fay$$fayToJs(type,fayObj){
   }
   else if(base == "nullable") {
     fayObj = Fay$$_(fayObj);
-    if (fayObj instanceof Language.Fay.FFI._Null) {
+    if (fayObj instanceof Fay.FFI._Null) {
       jsObj = null;
     } else {
       jsObj = Fay$$fayToJs(args[0],fayObj.slot1);
@@ -347,17 +347,17 @@ function Fay$$jsToFay(type,jsObj){
   }
   else if(base == "defined") {
     if (jsObj === undefined) {
-      fayObj = new Language.Fay.FFI._Undefined();
+      fayObj = new Fay.FFI._Undefined();
     } else {
-      fayObj = new Language.Fay.FFI._Defined(Fay$$jsToFay(args[0],jsObj));
+      fayObj = new Fay.FFI._Defined(Fay$$jsToFay(args[0],jsObj));
     }
 
   }
   else if(base == "nullable") {
     if (jsObj === null) {
-      fayObj = new Language.Fay.FFI._Null();
+      fayObj = new Fay.FFI._Null();
     } else {
-      fayObj = new Language.Fay.FFI.Nullable(Fay$$jsToFay(args[0],jsObj));
+      fayObj = new Fay.FFI.Nullable(Fay$$jsToFay(args[0],jsObj));
     }
 
   }

src/Fay/Compiler.hs

@@ -213,7 +213,7 @@ generateExports = do
 -- | Is the module a standard module, i.e., one that we'd rather not
 -- output code for if we're compiling separate files.
 anStdlibModule :: ModuleName -> Bool
-anStdlibModule (ModuleName name) = name `elem` ["Prelude","FFI","Language.Fay.FFI","Data.Data"]
+anStdlibModule (ModuleName name) = name `elem` ["Prelude","FFI","Fay.FFI","Data.Data"]
 
 -- | Compile the given import.
 compileImport :: ImportDecl -> Compile [JsStmt]

src/Fay/Compiler/Misc.hs

@@ -304,7 +304,7 @@ findImport alldirs mname = go alldirs mname where
 
   stdlibHack
     | mname == ModuleName "Language.Fay.Stdlib" = \s -> s ++ "\n\ndata Maybe a = Just a | Nothing"
-    | mname == ModuleName "Language.Fay.FFI"    = const "module Language.Fay.FFI where\n\ndata Nullable a = Nullable a | Null\n\ndata Defined a = Defined a | Undefined"
+    | mname == ModuleName "Fay.FFI" = const "module Fay.FFI where\n\ndata Nullable a = Nullable a | Null\n\ndata Defined a = Defined a | Undefined"
     | otherwise = id
 
 -- | Run the compiler.

src/Language/Fay/FFI.hs src/Fay/FFI.hssrc/Language/Fay/FFI.hs renamed to src/Fay/FFI.hs

@@ -1,9 +1,9 @@
 {-# LANGUAGE NoImplicitPrelude    #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 
--- | The internal FFI module. Needs to be renamed to Fay.FFI at some point.
+-- | The internal FFI module.
 
-module Language.Fay.FFI
+module Fay.FFI
   (Fay
   ,Nullable (..)
   ,Defined (..)
@@ -13,8 +13,7 @@ module Language.Fay.FFI
   where
 
 import           Fay.Types
-import           Prelude            (Bool, Char, Double, Int, Maybe, String,
-                                     error)
+import           Prelude      (Bool, Char, Double, Int, Maybe, String, error)
 
 -- | Values that may be null
 --  Nullable x decodes to x, Null decodes to null.
@@ -47,4 +46,4 @@ type Automatic a = a
 -- | Declare a foreign action.
 ffi :: String        -- ^ The foreign value.
     -> a             -- ^ Bottom.
-ffi = error "Language.Fay.FFI.foreignFay: Used foreign function not in a JS engine context."
+ffi = error "Fay.FFI.ffi: Used foreign function outside a JS engine context."

tests/Hierarchical/Export.hs

@@ -1,8 +1,6 @@
-
-
 module Hierarchical.Export where
 
-import           Language.Fay.FFI
+import           FFI
 import           Prelude
 
 exported :: String

tests/Hierarchical/RecordDefined.hs

@@ -1,8 +1,6 @@
-
-
 module Hierarchical.RecordDefined where
 
-import           Language.Fay.FFI
+import           FFI
 import           Prelude
 
 data Callback a = Callback Double

tests/ImportList1/A.hs

@@ -1,7 +1,7 @@
 module ImportList1.A where
 
 import           Prelude
-import           Language.Fay.FFI
+import           FFI
 
 x :: Double
 x = 1

tests/ImportList1/B.hs

@@ -1,7 +1,7 @@
 module ImportList1.B where
 
 import           Prelude
-import           Language.Fay.FFI
+import           FFI
 
 x :: Double
 x = 2