Fix imports for purescm runtime libs

arrays/src/Data/Array.ss

@@ -26,8 +26,8 @@
           )
   (import (except (chezscheme) length reverse)
           (only (rnrs sorting) vector-sort!)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
 ;;------------------------------------------------------------------------------
 ;; Array creation --------------------------------------------------------------

arrays/src/Data/Array/NonEmpty/Internal.ss

@@ -4,8 +4,8 @@
           traverse1Impl)
   (import (only (rnrs base) define lambda list cons let if)
           (only (chezscheme) fx- fx< fx>= fx1- fx1+)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define foldr1Impl
     (lambda (f xs)

arrays/src/Data/Array/ST.ss

@@ -17,8 +17,8 @@
           freezeImpl)
   (import (chezscheme)
           (only (rnrs sorting) vector-sort!)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define new
     (lambda () (rt:make-array)))

arrays/src/Data/Array/ST/Partial.ss

@@ -1,8 +1,8 @@
 (library (Data.Array.ST.Partial foreign)
   (export peekImpl pokeImpl)
   (import (only (rnrs base) define lambda quote)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define peekImpl
     (lambda (i xs)

assert/src/Test/Assert.ss

@@ -1,7 +1,7 @@
 (library (Test.Assert foreign)
   (export assertImpl checkThrows)
   (import (chezscheme)
-          (only (purs runtime pstring) pstring->string))
+          (only (purescm pstring) pstring->string))
 
   (define assertImpl
     (lambda (message)

console/src/Effect/Console.ss

@@ -12,7 +12,7 @@
           debug)
   (import (only (rnrs base) define lambda begin)
           (prefix (rnrs base) scm:)
-          (only (purs runtime pstring) pstring->string)
+          (only (purescm pstring) pstring->string)
           (only (rnrs io ports) current-output-port current-error-port put-string)
           (only (rnrs io simple) newline))
 

control/src/Control/Extend.ss

@@ -3,7 +3,7 @@
 (library (Control.Extend foreign)
   (export arrayExtend)
   (import (only (rnrs base) define lambda)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define arrayExtend
     (lambda (f)

datetime/src/Data/DateTime.ss

@@ -4,7 +4,7 @@
   (export calcDiff
           adjustImpl)
   (import (only (rnrs base) define lambda let let*)
-          (prefix (purs runtime) rt:)
+          (prefix (purescm runtime) rt:)
           (prefix (chezscheme) scm:))
 
   ;; Note: make-date in chez has a lower bound at 1901:

effect/src/Effect.ss

@@ -10,7 +10,7 @@
   (import (only (rnrs base) define lambda quote not)
           (only (rnrs arithmetic fixnums) fx+ fx>=?)
           (only (rnrs control) do)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define pureE
     (lambda (a)

exceptions/src/Effect/Exception.ss

@@ -16,7 +16,7 @@
             make-message-condition
             condition?
             message-condition?)
-          (only (purs runtime pstring) pstring->string string->pstring)
+          (only (purescm pstring) pstring->string string->pstring)
           (only (rnrs io ports) call-with-string-output-port)
           (only (rnrs exceptions) with-exception-handler raise-continuable)
           (only (chezscheme) format call/cc display-condition))

foldable-traversable/src/Data/Foldable.ss

@@ -4,7 +4,7 @@
   (export foldrArray
           foldlArray)
   (import (only (rnrs base) define lambda)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define foldrArray
     (lambda (f)

foldable-traversable/src/Data/FunctorWithIndex.ss

@@ -3,7 +3,7 @@
 (library (Data.FunctorWithIndex foreign)
   (export mapWithIndexArray)
   (import (only (rnrs base) define lambda)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define mapWithIndexArray
     (lambda (f)

foldable-traversable/src/Data/Traversable.ss

@@ -3,8 +3,8 @@
 (library (Data.Traversable foreign)
   (export traverseArrayImpl)
   (import (only (rnrs base) define lambda cons quote)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define kons
     (lambda (x)

foldable-traversable/test/Main.ss

@@ -4,8 +4,8 @@
           mkNEArray
           foldMap1NEArray)
   (import (chezscheme)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define arrayFrom1UpTo
     (lambda (n)

foreign-object/src/Foreign/Object.ss

@@ -17,9 +17,9 @@
           keys)
   (import (only (rnrs base) define lambda if let let* let-values begin)
           (prefix (chezscheme) scm:)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) arrays:)
-          (only (purs runtime pstring) pstring->symbol symbol->pstring))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) arrays:)
+          (only (purescm pstring) pstring->symbol symbol->pstring))
 
   (define _copyST
     (lambda (m)

foreign-object/src/Foreign/Object/ST.ss

@@ -7,8 +7,8 @@
           delete)
   (import (only (rnrs base) define lambda if let)
           (prefix (chezscheme) scm:)
-          (prefix (purs runtime) rt:)
-          (only (purs runtime pstring) pstring->symbol))
+          (prefix (purescm runtime) rt:)
+          (only (purescm pstring) pstring->symbol))
 
   (define remove-1st
     (lambda (x ls)

foreign-object/src/Foreign/Object/Unsafe.ss

@@ -4,8 +4,8 @@
   (export unsafeIndex)
   (import (only (rnrs base) define lambda if)
           (prefix (chezscheme) scm:)
-          (prefix (purs runtime) rt:)
-          (only (purs runtime pstring) pstring->symbol))
+          (prefix (purescm runtime) rt:)
+          (only (purescm pstring) pstring->symbol))
 
   (define unsafeIndex
     (lambda (m)

integers/src/Data/Int.ss

@@ -12,7 +12,7 @@
           (only (rnrs arithmetic flonums) fixnum->flonum fltruncate fl=?)
           (only (chezscheme) format flonum->fixnum fixnum? fx=? fx/ fxremainder expt
                              with-exception-handler string-append number->string string->number)
-          (only (purs runtime pstring) pstring->string string->pstring))
+          (only (purescm pstring) pstring->string string->pstring))
 
   (define fromNumberImpl
     (lambda (just)

json/src/JSON/Array.ss

@@ -1,7 +1,7 @@
 (library (JSON.Array foreign)
   (export singleton)
   (import (chezscheme)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define (singleton x) (srfi:214:flexvector x))
 

json/src/JSON/Internal.ss

@@ -19,8 +19,8 @@
           json-parse
           json-stringify)
   (import (except (chezscheme) length)
-          (prefix (purs runtime srfi :214) srfi:214:)
-          (purs runtime pstring))
+          (prefix (srfi :214) srfi:214:)
+          (purescm pstring))
 
   (define (_parse left right s)
     (call/cc

json/test/Main.ss

@@ -1,9 +1,9 @@
 (library (Test.JSON.Main foreign)
   (export testJsonParser)
   (import (chezscheme)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:)
-          (purs runtime pstring)
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:)
+          (purescm pstring)
           (only (JSON.Internal foreign) json-parse json-stringify))
 
   (define (assert-parsed input expected)

minibench/src/Performance/Minibench.ss

@@ -7,7 +7,7 @@
   )
 
   (import (chezscheme)
-          (only (purs runtime pstring) string->pstring)
+          (only (purescm pstring) string->pstring)
   )
 
   (define timeNs

numbers/src/Data/Number.ss

@@ -31,7 +31,7 @@
           (only (chezscheme) flabs flacos flasin flatan flceiling flcos flexp flpositive?
                              flfloor fllog flmax flmin flexpt flmod flround fl-
                              fl= fl< flsin flsqrt fltan fltruncate flonum? fixnum? fixnum->flonum)
-          (only (purs runtime pstring) pstring->number))
+          (only (purescm pstring) pstring->number))
 
   (define nan +nan.0)
 

numbers/src/Data/Number/Format.ss

@@ -7,7 +7,7 @@
           toString)
   (import (only (rnrs base) define lambda string-append number->string)
           (only (chezscheme) format)
-          (only (purs runtime pstring) string->pstring))
+          (only (purescm pstring) string->pstring))
 
   ;; TODO add a proper implementation
   (define toPrecisionNative

partial/src/Partial.ss

@@ -3,7 +3,7 @@
 (library (Partial foreign)
   (export _crashWith)
   (import (only (rnrs base) define lambda error)
-          (only (purs runtime pstring) pstring->string))
+          (only (purescm pstring) pstring->string))
 
   (define _crashWith
     (lambda (msg)

prelude/src/Control/Apply.ss

@@ -3,8 +3,8 @@
 (library (Control.Apply foreign)
   (export arrayApply)
   (import (only (rnrs base) define lambda let * + set!)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define arrayApply
     (lambda (fs)

prelude/src/Control/Bind.ss

@@ -3,8 +3,8 @@
 (library (Control.Bind foreign)
   (export arrayBind)
   (import (chezscheme)
-          (prefix (purs runtime) rt:)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (purescm runtime) rt:)
+          (prefix (srfi :214) srfi:214:))
 
   (define arrayBind
     (lambda (arr)

prelude/src/Data/Eq.ss

@@ -9,8 +9,8 @@
           eqArrayImpl)
   (import (chezscheme))
   (import (only (rnrs base) define lambda)
-          (only (purs runtime pstring) pstring=?)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (only (purescm pstring) pstring=?)
+          (prefix (srfi :214) srfi:214:))
 
   (define eqBooleanImpl
     (lambda (r1)

prelude/src/Data/Functor.ss

@@ -3,7 +3,7 @@
 (library (Data.Functor foreign)
   (export arrayMap)
   (import (only (rnrs base) define lambda)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define arrayMap
     (lambda (f)

prelude/src/Data/Ord.ss

@@ -8,8 +8,8 @@
           ordCharImpl
           ordArrayImpl)
   (import (chezscheme)
-          (only (purs runtime pstring) pstring<? pstring=?)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (only (purescm pstring) pstring<? pstring=?)
+          (prefix (srfi :214) srfi:214:))
 
   (define ordBooleanImpl
     (lambda (lt)

prelude/src/Data/Semigroup.ss

@@ -4,8 +4,8 @@
   (export concatString
           concatArray)
   (import (only (rnrs base) define lambda)
-          (only (purs runtime pstring) pstring-concat)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (only (purescm pstring) pstring-concat)
+          (prefix (srfi :214) srfi:214:))
 
   (define concatString
     (lambda (s1)

prelude/src/Data/Show.ss

@@ -7,16 +7,16 @@
           showStringImpl
           showArrayImpl)
   (import (chezscheme)
-          (prefix (purs runtime) rt:)
-          (only (purs runtime pstring) pstring
+          (prefix (purescm runtime) rt:)
+          (only (purescm pstring) pstring
                                           number->pstring
                                           string->pstring
                                           pstring-uncons-char
                                           pstring->string
                                           pstring-concat
                                           pstring-make-regex
                                           pstring-regex-replace-by)
-          (prefix (purs runtime srfi :214) srfi:214:))
+          (prefix (srfi :214) srfi:214:))
 
   (define showIntImpl
     (lambda (n)

prelude/src/Data/Show/Generic.ss

@@ -3,8 +3,8 @@
 (library (Data.Show.Generic foreign)
   (export intercalate)
   (import (chezscheme)
-          (only (purs runtime pstring) pstring pstring-concat)
-          (prefix (purs runtime) rt:))
+          (only (purescm pstring) pstring pstring-concat)
+          (prefix (purescm runtime) rt:))
 
   (define intercalate
     (lambda (separator)

prelude/src/Record/Unsafe.ss

@@ -6,8 +6,8 @@
           unsafeSet
           unsafeDelete)
   (import (chezscheme)
-          (only (purs runtime pstring) pstring->symbol)
-          (prefix (purs runtime) rt:))
+          (only (purescm pstring) pstring->symbol)
+          (prefix (purescm runtime) rt:))
 
   (define unsafeHas
     (lambda (label)

prelude/test/Test/Utils.ss

@@ -1,6 +1,6 @@
 (library (Test.Utils foreign)
   (export throwErr)
-  (import (chezscheme) (only (purs runtime pstring) pstring->string))
+  (import (chezscheme) (only (purescm pstring) pstring->string))
 
   (define throwErr
     (lambda (msg) 

record/src/Record/Builder.ss

@@ -1,8 +1,8 @@
 (library (Record.Builder foreign)
   (export unsafeInsert unsafeModify unsafeDelete unsafeRename)
   (import (chezscheme)
-          (prefix (purs runtime) rt:)
-          (only (purs runtime pstring) pstring->symbol))
+          (prefix (purescm runtime) rt:)
+          (only (purescm pstring) pstring->symbol))
 
   (define unsafeInsert
     (lambda (l)

record/src/Record/Unsafe/Union.ss

@@ -1,7 +1,7 @@
 (library (Record.Unsafe.Union foreign)
   (export unsafeUnionFn)
   (import (chezscheme)
-          (prefix (purs runtime) rt:))
+          (prefix (purescm runtime) rt:))
 
   (define unsafeUnionFn append)
 

refs/src/Effect/Ref.ss

@@ -7,7 +7,7 @@
           modifyImpl
           write)
   (import (prefix (chezscheme) scm:)
-          (prefix (purs runtime) rt:))
+          (prefix (purescm runtime) rt:))
 
   (scm:define _new
     (scm:lambda (v)