Skip to content

Commit 80dcf7e

Browse files
garybgaryb
authored
Merge pull request #108 from purescript/compiler/0.12
Updates for PureScript 0.12
2 parents 6fce657 + b1d4446 commit 80dcf7e

37 files changed

+3463
-2058
lines changed

‎LICENSE

+22-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
1-
The MIT License (MIT)
1+
Copyright 2018 PureScript
22

3-
Copyright (c) 2014 PureScript
3+
Redistribution and use in source and binary forms, with or without modification,
4+
are permitted provided that the following conditions are met:
45

5-
Permission is hereby granted, free of charge, to any person obtaining a copy of
6-
this software and associated documentation files (the "Software"), to deal in
7-
the Software without restriction, including without limitation the rights to
8-
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9-
the Software, and to permit persons to whom the Software is furnished to do so,
10-
subject to the following conditions:
6+
1. Redistributions of source code must retain the above copyright notice, this
7+
list of conditions and the following disclaimer.
118

12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
9+
2. Redistributions in binary form must reproduce the above copyright notice,
10+
this list of conditions and the following disclaimer in the documentation and/or
11+
other materials provided with the distribution.
1412

15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
17-
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
18-
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
19-
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
20-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13+
3. Neither the name of the copyright holder nor the names of its contributors
14+
may be used to endorse or promote products derived from this software without
15+
specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
21+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
24+
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎bench/Main.purs

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
module Bench.Main where
2+
3+
import Prelude
4+
5+
import Control.Monad.Eff (Eff)
6+
import Control.Monad.Eff.Console (CONSOLE, log)
7+
import Data.Array.NonEmpty (fromArray)
8+
import Data.Maybe (fromJust)
9+
import Data.String (toCharArray)
10+
import Data.String.NonEmpty (fromFoldable1, fromNonEmptyCharArray)
11+
import Partial.Unsafe (unsafePartial)
12+
import Performance.Minibench (benchWith)
13+
14+
main :: Eff (console :: CONSOLE) Unit
15+
main = do
16+
log "NonEmpty conversions"
17+
log "======"
18+
log ""
19+
benchNonEmptyConversions
20+
21+
benchNonEmptyConversions :: Eff (console :: CONSOLE) Unit
22+
benchNonEmptyConversions = do
23+
log "fromNonEmptyCharArray: short"
24+
log "---"
25+
benchFromNonEmptyCharArray
26+
log ""
27+
28+
log "fromFoldable1"
29+
log "---"
30+
benchFromFoldable1
31+
log ""
32+
33+
where
34+
35+
benchFromNonEmptyCharArray = do
36+
log "short string"
37+
bench \_ -> fromNonEmptyCharArray shortStringArr
38+
39+
log "long string"
40+
bench \_ -> fromNonEmptyCharArray longStringArr
41+
42+
benchFromFoldable1 = do
43+
log "short string"
44+
bench \_ -> fromFoldable1 shortStringArr
45+
46+
log "long string"
47+
bench \_ -> fromFoldable1 longStringArr
48+
49+
shortStringArr = unsafePartial fromJust $ fromArray
50+
$ toCharArray "supercalifragilisticexpialidocious"
51+
longStringArr = unsafePartial fromJust $ fromArray
52+
$ toCharArray loremIpsum
53+
54+
bench = benchWith 100000
55+
56+
loremIpsum :: String
57+
loremIpsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut aliquet euismod ligula, vitae lacinia lorem imperdiet nec. Nulla volutpat ullamcorper mollis. Proin interdum quam a sem auctor, id tempus nisl pretium. Suspendisse potenti. Quisque ut libero consequat, suscipit sem a, malesuada nisi. Aliquam dictum odio mi, eu laoreet felis scelerisque non. Ut in odio vehicula, cursus augue sed, tincidunt lorem. Vestibulum consequat lectus eu commodo vulputate. Nam vitae faucibus ipsum. Curabitur sit amet neque sed est sagittis vehicula nec nec risus. Phasellus consectetur cursus malesuada. Vestibulum commodo lorem ut mauris mollis faucibus. Integer ut massa auctor, scelerisque nisi nec, rutrum nisl. Integer vel ex sem. Sed purus felis, molestie eget cursus vel, maximus ut augue. Curabitur nunc ligula, lobortis vitae vehicula a, volutpat nec sem. Phasellus non sapien ipsum. Mauris dolor justo, mollis at elit a, sollicitudin commodo quam. Curabitur posuere felis at nunc pharetra, eu convallis lectus dapibus. Aliquam ullamcorper porta fermentum. Donec at tellus metus. Donec pharetra tempor odio sit amet viverra. Nam vel metus libero. Vivamus maximus quis lacus id pharetra. Duis sed diam molestie, sodales leo id, pulvinar justo. In non augue tempor risus consectetur hendrerit. In libero nulla, elementum non ultrices eu, vehicula non ipsum. Maecenas in hendrerit tellus, sodales dignissim turpis. Ut odio diam, convallis in elit non, consequat gravida nisi. Cras egestas metus eleifend sapien efficitur, vel vulputate est porta. Aliquam posuere, magna nec bibendum luctus, quam risus efficitur sapien, id volutpat metus ex non lorem. Praesent velit eros, efficitur sed tortor quis, lobortis eleifend ligula. Sed tellus quam, aliquet vitae sagittis a, egestas eget massa. Etiam odio elit, hendrerit vel dui vel, fermentum pharetra neque. Curabitur quis mauris id lacus consectetur rhoncus non nec mauris. Mauris blandit tempor pretium. Donec non nisi finibus, lobortis dolor vitae, euismod arcu. Nullam scelerisque lacus in dolor volutpat mollis. Nunc vitae consectetur ligula, quis laoreet quam.Proin sit amet nisi eu orci hendrerit imperdiet vitae sit amet leo. Donec sodales id ante eget viverra. Nullam vitae elit in mauris accumsan feugiat id a velit. Nulla facilisi. Cras in turpis efficitur, consectetur justo quis, suscipit tortor. Sed tincidunt pellentesque sapien, in ultricies eros rhoncus sit amet. Integer blandit ornare lobortis. Duis dictum sit amet mauris sit amet cursus. Nullam nec nisl mauris. Praesent cursus imperdiet mi mattis luctus. Donec in tortor fermentum, efficitur turpis vel, facilisis augue. Integer egestas nisl et magna volutpat ornare. Donec pulvinar risus elit, eget viverra est feugiat in.Ut nec ante vestibulum neque pulvinar pretium sit amet eu nisi. Aliquam erat volutpat. Maecenas egestas nisi et mi congue, sed ultricies nibh posuere. Suspendisse potenti. Donec a nulla et velit elementum pretium. Pellentesque gravida imperdiet sem et varius. Praesent ac diam diam. Donec iaculis risus ex, ac eleifend sapien luctus ut. Fusce aliquet, lacus tincidunt porta malesuada, massa augue commodo nulla, ac malesuada tortor est sed eros. Praesent mattis, nisi eget ullamcorper vestibulum, lacus ante placerat metus, ac ullamcorper ante tellus vel nulla. Praesent vehicula in est sit amet varius. Sed facilisis felis sed sem porttitor rutrum. Etiam sollicitudin erat neque, id gravida metus scelerisque quis. Proin venenatis pharetra lectus ac auctor."

‎bower.json

+20-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "purescript-strings",
33
"homepage": "https://github.com/purescript/purescript-strings",
4-
"description": "String and char utility functions, regular expressions.",
5-
"license": "MIT",
4+
"license": "BSD-3-Clause",
65
"repository": {
76
"type": "git",
87
"url": "git://github.com/purescript/purescript-strings.git"
@@ -17,16 +16,26 @@
1716
"package.json"
1817
],
1918
"dependencies": {
20-
"purescript-either": "^3.0.0",
21-
"purescript-gen": "^1.1.0",
22-
"purescript-maybe": "^3.0.0",
23-
"purescript-partial": "^1.2.0",
24-
"purescript-unfoldable": "^3.0.0",
25-
"purescript-arrays": "^4.0.1",
26-
"purescript-integers": "^3.2.0"
19+
"purescript-arrays": "^5.0.0",
20+
"purescript-control": "^4.0.0",
21+
"purescript-either": "^4.0.0",
22+
"purescript-enums": "^4.0.0",
23+
"purescript-foldable-traversable": "^4.0.0",
24+
"purescript-gen": "^2.0.0",
25+
"purescript-integers": "^4.0.0",
26+
"purescript-maybe": "^4.0.0",
27+
"purescript-newtype": "^3.0.0",
28+
"purescript-nonempty": "^5.0.0",
29+
"purescript-partial": "^2.0.0",
30+
"purescript-prelude": "^4.0.0",
31+
"purescript-tailrec": "^4.0.0",
32+
"purescript-tuples": "^5.0.0",
33+
"purescript-unfoldable": "^4.0.0",
34+
"purescript-unsafe-coerce": "^4.0.0"
2735
},
2836
"devDependencies": {
29-
"purescript-assert": "^3.0.0",
30-
"purescript-console": "^3.0.0"
37+
"purescript-assert": "^4.0.0",
38+
"purescript-console": "^4.0.0",
39+
"purescript-minibench": "^2.0.0"
3140
}
3241
}

‎package.json

+8-5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,15 @@
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
55
"build": "eslint src && pulp build -- --censor-lib --strict",
6-
"test": "pulp test"
6+
"test": "pulp test",
7+
"bench:build": "purs compile 'bench/**/*.purs' 'src/**/*.purs' 'bower_components/*/src/**/*.purs'",
8+
"bench:run": "node --expose-gc -e 'require(\"./output/Bench.Main/index.js\").main()'",
9+
"bench": "npm run bench:build && npm run bench:run"
710
},
811
"devDependencies": {
9-
"eslint": "^3.17.1",
10-
"pulp": "^10.0.4",
11-
"purescript-psa": "^0.5.0-rc.1",
12-
"rimraf": "^2.6.1"
12+
"eslint": "^4.19.1",
13+
"pulp": "^12.2.0",
14+
"purescript-psa": "^0.6.0",
15+
"rimraf": "^2.6.2"
1316
}
1417
}

‎src/Data/Char.js

-17
This file was deleted.

‎src/Data/Char.purs

+9-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
-- | A type and functions for single characters.
22
module Data.Char
3-
( fromCharCode
4-
, toCharCode
5-
, toLower
6-
, toUpper
3+
( toCharCode
4+
, fromCharCode
75
) where
86

7+
import Data.Enum (fromEnum, toEnum)
8+
import Data.Maybe (Maybe)
9+
910
-- | Returns the numeric Unicode value of the character.
10-
foreign import toCharCode :: Char -> Int
11+
toCharCode :: Char -> Int
12+
toCharCode = fromEnum
1113

1214
-- | Constructs a character from the given Unicode numeric value.
13-
foreign import fromCharCode :: Int -> Char
14-
15-
-- | Converts a character to lowercase.
16-
foreign import toLower :: Char -> Char
17-
18-
-- | Converts a character to uppercase.
19-
foreign import toUpper :: Char -> Char
15+
fromCharCode :: Int -> Maybe Char
16+
fromCharCode = toEnum

‎src/Data/Char/Gen.purs

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,33 @@ module Data.Char.Gen where
33
import Prelude
44

55
import Control.Monad.Gen (class MonadGen, chooseInt, oneOf)
6-
import Data.Char as C
6+
import Data.Enum (toEnumWithDefaults)
77
import Data.NonEmpty ((:|))
88

99
-- | Generates a character of the Unicode basic multilingual plane.
1010
genUnicodeChar :: forall m. MonadGen m => m Char
11-
genUnicodeChar = C.fromCharCode <$> chooseInt 0 65536
11+
genUnicodeChar = toEnumWithDefaults bottom top <$> chooseInt 0 65536
1212

1313
-- | Generates a character in the ASCII character set, excluding control codes.
1414
genAsciiChar :: forall m. MonadGen m => m Char
15-
genAsciiChar = C.fromCharCode <$> chooseInt 32 127
15+
genAsciiChar = toEnumWithDefaults bottom top <$> chooseInt 32 127
1616

1717
-- | Generates a character in the ASCII character set.
1818
genAsciiChar' :: forall m. MonadGen m => m Char
19-
genAsciiChar' = C.fromCharCode <$> chooseInt 0 127
19+
genAsciiChar' = toEnumWithDefaults bottom top <$> chooseInt 0 127
2020

2121
-- | Generates a character that is a numeric digit.
2222
genDigitChar :: forall m. MonadGen m => m Char
23-
genDigitChar = C.fromCharCode <$> chooseInt 48 57
23+
genDigitChar = toEnumWithDefaults bottom top <$> chooseInt 48 57
2424

2525
-- | Generates a character from the basic latin alphabet.
2626
genAlpha :: forall m. MonadGen m => m Char
2727
genAlpha = oneOf (genAlphaLowercase :| [genAlphaUppercase])
2828

2929
-- | Generates a lowercase character from the basic latin alphabet.
3030
genAlphaLowercase :: forall m. MonadGen m => m Char
31-
genAlphaLowercase = C.fromCharCode <$> chooseInt 97 122
31+
genAlphaLowercase = toEnumWithDefaults bottom top <$> chooseInt 97 122
3232

3333
-- | Generates an uppercase character from the basic latin alphabet.
3434
genAlphaUppercase :: forall m. MonadGen m => m Char
35-
genAlphaUppercase = C.fromCharCode <$> chooseInt 65 90
35+
genAlphaUppercase = toEnumWithDefaults bottom top <$> chooseInt 65 90

0 commit comments

Comments
 (0)