- rename of jscript target to js, all ffi calls should change sourcet…

…ext. Internally in naming convention JScript changed to JavaScript - version bump to 1.1.3 - branches/jurrien-xp from now is obsolete, soon to be replaced by javascript specific experimentation branch in branches/js WARNING: make clean; rerun ./configure
spockz · Jan 27, 2012 · def45a1 · def45a1
1 parent 92bbe8b
commit def45a1
Show file tree

Hide file tree

Showing 150 changed files with 908 additions and 640 deletions.
diff --git a/EHC/Makefile b/EHC/Makefile
@@ -79,8 +79,8 @@ include $(SRC_PREFIX)rts/files.mk
 ifeq ($(ENABLE_JAVA),yes)
 -include $(SRC_PREFIX)jazy/files.mk
 endif
-ifeq ($(ENABLE_JSCRIPT),yes)
--include $(SRC_PREFIX)jscript/files.mk
+ifeq ($(ENABLE_JS),yes)
+-include $(SRC_PREFIX)javascript/files.mk
 endif
 include $(SRC_PREFIX)ehc/files2.mk
 -include $(SRC_PREFIX)agprimer/files.mk
@@ -275,7 +275,7 @@ uhc-install-postprocess-core:
 
 uhc-install-postprocess-jazy:
 
-uhc-install-postprocess-jscript:
+uhc-install-postprocess-js:
 
 uhc-install-postprocess-llvm:
 

diff --git a/EHC/SVNREVISION b/EHC/SVNREVISION
@@ -1 +1 @@
-2421M
+2422M
diff --git a/EHC/VERSION b/EHC/VERSION
@@ -1 +1 @@
-1.1.2
+1.1.3
diff --git a/EHC/configure b/EHC/configure
@@ -681,7 +681,7 @@ javacCmd
 jarCmd
 JAVAC_CMD
 JAR_CMD
-ENABLE_JSCRIPT
+ENABLE_JS
 ENABLE_CMM
 ENABLE_CWHOLEPROG
 ENABLE_LLVM
@@ -756,7 +756,7 @@ GCC_EHC_EXTRA_EXTERN_LIBS
 SUFFIX_SHELL
 SUFFIX_EXEC
 SUFFIX_LIBC
-SUFFIX_LIBJSCRIPT
+SUFFIX_LIBJS
 PREFIX_LIB
 PATHS_SEP
 SLASH
@@ -2370,10 +2370,10 @@ echo "$as_me: error:
 
 fi
 
-### enable options: jscript (JavaScript), default is yes
-# AC_ARG_ENABLE(jscript, AS_HELP_STRING([--enable-jscript],[include JavaScript code generation]), [enableJScript=yes], [enableJScript=no])
-enableJScript="yes"
-ENABLE_JSCRIPT=$enableJScript
+### enable options: js (JavaScript), default is yes
+# AC_ARG_ENABLE(js, AS_HELP_STRING([--enable-js],[include JavaScript code generation]), [enableJavaScript=yes], [enableJavaScript=no])
+enableJavaScript="yes"
+ENABLE_JS=$enableJavaScript
 
 
 ### enable options: cmm, default is no, temporary until development is ready
@@ -31416,7 +31416,7 @@ GCC_EHC_EXTRA_EXTERN_LIBS="$gcc_ehc_extra_extern_libs"
 suffix_shell=""
 suffix_exec=""
 suffix_libC=".a"
-suffix_libJScript=".mjs"
+suffix_libJavaScript=".mjs"
 prefix_lib=""
 # development platform
 development_platform="UNIX"
@@ -31475,7 +31475,7 @@ SUFFIX_EXEC="$suffix_exec"
 
 SUFFIX_LIBC="$suffix_libC"
 
-SUFFIX_LIBJSCRIPT="$suffix_libJScript"
+SUFFIX_LIBJS="$suffix_libJavaScript"
 
 PREFIX_LIB="$prefix_lib"
 
@@ -32289,7 +32289,7 @@ javacCmd!$javacCmd$ac_delim
 jarCmd!$jarCmd$ac_delim
 JAVAC_CMD!$JAVAC_CMD$ac_delim
 JAR_CMD!$JAR_CMD$ac_delim
-ENABLE_JSCRIPT!$ENABLE_JSCRIPT$ac_delim
+ENABLE_JS!$ENABLE_JS$ac_delim
 ENABLE_CMM!$ENABLE_CMM$ac_delim
 ENABLE_CWHOLEPROG!$ENABLE_CWHOLEPROG$ac_delim
 ENABLE_LLVM!$ENABLE_LLVM$ac_delim
@@ -32405,7 +32405,7 @@ GCC_EHC_EXTRA_EXTERN_LIBS!$GCC_EHC_EXTRA_EXTERN_LIBS$ac_delim
 SUFFIX_SHELL!$SUFFIX_SHELL$ac_delim
 SUFFIX_EXEC!$SUFFIX_EXEC$ac_delim
 SUFFIX_LIBC!$SUFFIX_LIBC$ac_delim
-SUFFIX_LIBJSCRIPT!$SUFFIX_LIBJSCRIPT$ac_delim
+SUFFIX_LIBJS!$SUFFIX_LIBJS$ac_delim
 PREFIX_LIB!$PREFIX_LIB$ac_delim
 PATHS_SEP!$PATHS_SEP$ac_delim
 SLASH!$SLASH$ac_delim

diff --git a/EHC/configure.ac b/EHC/configure.ac
@@ -128,10 +128,10 @@ then
   AC_SUBST(JAR_CMD,$jarCmd)
 fi
 
-### enable options: jscript (JavaScript), default is yes
-# AC_ARG_ENABLE(jscript, AS_HELP_STRING([--enable-jscript],[include JavaScript code generation]), [enableJScript=yes], [enableJScript=no])
-enableJScript="yes"
-AC_SUBST(ENABLE_JSCRIPT,$enableJScript)
+### enable options: js (JavaScript), default is yes
+# AC_ARG_ENABLE(js, AS_HELP_STRING([--enable-js],[include JavaScript code generation]), [enableJavaScript=yes], [enableJavaScript=no])
+enableJavaScript="yes"
+AC_SUBST(ENABLE_JS,$enableJavaScript)
 
 ### enable options: cmm, default is no, temporary until development is ready
 AC_ARG_ENABLE(cmm, AS_HELP_STRING([--enable-cmm],[include cmm code generation]), [enableCmm=yes], [enableCmm=no])
@@ -989,7 +989,7 @@ AC_SUBST(GCC_EHC_EXTRA_EXTERN_LIBS,"$gcc_ehc_extra_extern_libs")
 suffix_shell=""
 suffix_exec=""
 suffix_libC=".a"
-suffix_libJScript=".mjs"
+suffix_libJavaScript=".mjs"
 prefix_lib=""
 # development platform
 development_platform="UNIX"
@@ -1045,7 +1045,7 @@ esac
 AC_SUBST(SUFFIX_SHELL,"$suffix_shell")
 AC_SUBST(SUFFIX_EXEC,"$suffix_exec")
 AC_SUBST(SUFFIX_LIBC,"$suffix_libC")
-AC_SUBST(SUFFIX_LIBJSCRIPT,"$suffix_libJScript")
+AC_SUBST(SUFFIX_LIBJS,"$suffix_libJavaScript")
 AC_SUBST(PREFIX_LIB,"$prefix_lib")
 AC_SUBST(PATHS_SEP,"$paths_sep")
 AC_SUBST(SLASH,"$slash")

diff --git a/EHC/ehclib/base/Prelude.hs b/EHC/ehclib/base/Prelude.hs
@@ -26,7 +26,7 @@ module Prelude
   , module UHC.Show
   , module UHC.Read
   , module UHC.Run
-#if ( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) || defined (__UHC_TARGET_LLVM__) )
+#if ( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) || defined (__UHC_TARGET_LLVM__) )
   , module UHC.OldIO
 #else
   , module System.IO
@@ -69,13 +69,13 @@ import UHC.Show
 import UHC.Read
 import UHC.IOBase
   ( IOError, ioError, userError, catch, unsafePerformIO
-#if (defined(__UHC_TARGET_C__) || defined (__UHC_TARGET_LLVM__)) && !defined(__UHC_TARGET_JSCRIPT__)
+#if (defined(__UHC_TARGET_C__) || defined (__UHC_TARGET_LLVM__)) && !defined(__UHC_TARGET_JS__)
   , FilePath
 #endif
   )
 import UHC.Run
 
-#if ( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) || defined (__UHC_TARGET_LLVM__) )
+#if ( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) || defined (__UHC_TARGET_LLVM__) )
 import UHC.OldIO
 #else
 import System.IO

diff --git a/EHC/ehclib/base/System/CPUTime.hsc b/EHC/ehclib/base/System/CPUTime.hsc
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 
 -----------------------------------------------------------------------------
 -- |

diff --git a/EHC/ehclib/base/System/Console/GetOpt.hs b/EHC/ehclib/base/System/Console/GetOpt.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 
 -----------------------------------------------------------------------------
 -- |

diff --git a/EHC/ehclib/base/System/Environment.hs b/EHC/ehclib/base/System/Environment.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 
 -----------------------------------------------------------------------------
 -- |

diff --git a/EHC/ehclib/files2.mk b/EHC/ehclib/files2.mk
@@ -254,7 +254,7 @@ ehclib-codegentargetspecific-C: $(if $(EHC_CFG_USE_GRIN),$(INSTALL_LIB_RTS),)
 
 ehclib-codegentargetspecific-jazy: $(if $(ENABLE_JAVA),$(INSTALL_LIB_JAZY),)
 
-ehclib-codegentargetspecific-jscript: $(if $(ENABLE_JSCRIPT),$(INSTALL_LIB_JSCRIPT),)
+ehclib-codegentargetspecific-js: $(if $(ENABLE_JS),$(INSTALL_LIB_JS),)
 
 ehclib-codegentargetspecific-core:
 

diff --git a/EHC/ehclib/haskell98/CError.hs b/EHC/ehclib/haskell98/CError.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module CError (module Foreign.C.Error) where
 import Foreign.C.Error
diff --git a/EHC/ehclib/haskell98/CForeign.hs b/EHC/ehclib/haskell98/CForeign.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module CForeign ( module Foreign.C ) where
 import Foreign.C
diff --git a/EHC/ehclib/haskell98/CPUTime.hs b/EHC/ehclib/haskell98/CPUTime.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module CPUTime (
     getCPUTime, cpuTimePrecision 
   ) where

diff --git a/EHC/ehclib/haskell98/CString.hs b/EHC/ehclib/haskell98/CString.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module CString (module Foreign.C.String) where
 import Foreign.C.String
diff --git a/EHC/ehclib/haskell98/CTypes.hs b/EHC/ehclib/haskell98/CTypes.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module CTypes (module Foreign.C.Types) where
 import Foreign.C.Types
diff --git a/EHC/ehclib/haskell98/Directory.hs b/EHC/ehclib/haskell98/Directory.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Directory (
     Permissions( Permissions, readable, writable, executable, searchable ), 
     createDirectory, removeDirectory, removeFile, 

diff --git a/EHC/ehclib/haskell98/ForeignPtr.hs b/EHC/ehclib/haskell98/ForeignPtr.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module ForeignPtr (module Foreign.ForeignPtr) where
 import Foreign.ForeignPtr
diff --git a/EHC/ehclib/haskell98/IO.hs b/EHC/ehclib/haskell98/IO.hs
@@ -2,40 +2,40 @@
 
 module IO (
     Handle, 
-#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
     HandlePosn,
 #endif
     IOMode(ReadMode,WriteMode,AppendMode,ReadWriteMode),
-#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
     BufferMode(NoBuffering,LineBuffering,BlockBuffering),
     SeekMode(AbsoluteSeek,RelativeSeek,SeekFromEnd),
 #endif
-#if !defined(__UHC_TARGET_JSCRIPT__)
+#if !defined(__UHC_TARGET_JS__)
     stdin,
 #endif
     stdout, stderr, 
-#if !defined(__UHC_TARGET_JSCRIPT__)
+#if !defined(__UHC_TARGET_JS__)
     openFile,
 #endif
     hClose, 
-#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
     hFileSize, hIsEOF, isEOF,
     hSetBuffering, hGetBuffering,
 #endif
     hFlush, 
-#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
     hGetPosn, hSetPosn, hSeek, 
     hWaitForInput, hReady, hGetChar, hGetLine, hLookAhead,
 #endif
-#if !defined(__UHC_TARGET_JSCRIPT__)
+#if !defined(__UHC_TARGET_JS__)
     hGetContents, 
 #endif
     hPutChar, hPutStr, hPutStrLn,
-#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
     hPrint,
     hIsOpen, hIsClosed, hIsReadable, hIsWritable, hIsSeekable,
 #endif
-#if !( defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_JS__) )
     isAlreadyExistsError, isDoesNotExistError, isAlreadyInUseError, 
     isFullError, isEOFError,
     isIllegalOperation, isPermissionError, isUserError, 
@@ -46,29 +46,29 @@ module IO (
 
     -- ...and what the Prelude exports
     IO,
-#if !( defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_JS__) )
     FilePath,
 #endif
     IOError, ioError, userError, catch,
-#if !defined(__UHC_TARGET_JSCRIPT__)
+#if !defined(__UHC_TARGET_JS__)
     interact,
 #endif
     putChar, putStr, putStrLn, print,
-#if !defined(__UHC_TARGET_JSCRIPT__)
+#if !defined(__UHC_TARGET_JS__)
     getChar, getLine, getContents,
     readFile, writeFile, appendFile,
 #endif
-#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
     readIO, readLn
 #endif
   ) where
 
-#if ( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JSCRIPT__) )
+#if ( defined(__UHC_TARGET_C__) || defined(__UHC_TARGET_JS__) )
 import UHC.OldIO
 #else
 import System.IO
 #endif
-#if !( defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_JS__) )
 import System.IO.Error
 #endif
 
@@ -80,7 +80,7 @@ import System.IO.Error
 -- The version of @bracket@ in "Control.Exception" handles all exceptions,
 -- and should be used instead.
 
-#if !( defined(__UHC_TARGET_JSCRIPT__) )
+#if !( defined(__UHC_TARGET_JS__) )
 bracket        :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c
 bracket before after m = do
         x  <- before

diff --git a/EHC/ehclib/haskell98/Int.hs b/EHC/ehclib/haskell98/Int.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Int ( module Data.Int ) where
 import Data.Int
diff --git a/EHC/ehclib/haskell98/Locale.hs b/EHC/ehclib/haskell98/Locale.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Locale (
     TimeLocale(..), defaultTimeLocale
   ) where

diff --git a/EHC/ehclib/haskell98/MarshalAlloc.hs b/EHC/ehclib/haskell98/MarshalAlloc.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module MarshalAlloc (module Foreign.Marshal.Alloc) where
 import Foreign.Marshal.Alloc
diff --git a/EHC/ehclib/haskell98/MarshalArray.hs b/EHC/ehclib/haskell98/MarshalArray.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module MarshalArray (module Foreign.Marshal.Array) where
 import Foreign.Marshal.Array
diff --git a/EHC/ehclib/haskell98/MarshalError.hs b/EHC/ehclib/haskell98/MarshalError.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module MarshalError (
   	module Foreign.Marshal.Error,
 	IOErrorType,

diff --git a/EHC/ehclib/haskell98/MarshalUtils.hs b/EHC/ehclib/haskell98/MarshalUtils.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module MarshalUtils (module Foreign.Marshal.Utils) where
 import Foreign.Marshal.Utils
diff --git a/EHC/ehclib/haskell98/Ptr.hs b/EHC/ehclib/haskell98/Ptr.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 
 module Ptr (module Foreign.Ptr) where
 import Foreign.Ptr
diff --git a/EHC/ehclib/haskell98/Random.hs b/EHC/ehclib/haskell98/Random.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Random (
    RandomGen(next, split, genRange),
    StdGen, mkStdGen,

diff --git a/EHC/ehclib/haskell98/StablePtr.hs b/EHC/ehclib/haskell98/StablePtr.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module StablePtr (module Foreign.StablePtr) where
 import Foreign.StablePtr
diff --git a/EHC/ehclib/haskell98/Storable.hs b/EHC/ehclib/haskell98/Storable.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Storable (module Foreign.Storable) where
 import Foreign.Storable
diff --git a/EHC/ehclib/haskell98/System.hs b/EHC/ehclib/haskell98/System.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 
 module System (
     ExitCode(ExitSuccess,ExitFailure),

diff --git a/EHC/ehclib/haskell98/Time.hs b/EHC/ehclib/haskell98/Time.hs
@@ -1,4 +1,4 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Time (
     ClockTime, 
     Month(January,February,March,April,May,June,

diff --git a/EHC/ehclib/haskell98/Word.hs b/EHC/ehclib/haskell98/Word.hs
@@ -1,3 +1,3 @@
-{-# EXCLUDE_IF_TARGET jscript #-}
+{-# EXCLUDE_IF_TARGET js #-}
 module Word ( module Data.Word ) where
 import Data.Word
diff --git a/EHC/ehclib/uhcbase/Data/Bits.hs b/EHC/ehclib/uhcbase/Data/Bits.hs
@@ -263,7 +263,7 @@ instance Bits Int where
     shiftR                 = primShiftRightInt
     rotateL                = primRotateLeftInt
     rotateR                = primRotateRightInt
-#if defined( __UHC_TARGET_JSCRIPT__ )
+#if defined( __UHC_TARGET_JS__ )
     bitSize  _             = 31 -- for now...
 #elif defined( __UHC_TARGET_BC__ )
     bitSize _              = SIZEOF_HSINT*8 - BITSIZEOF_WORDTAG