Skip to content

Commit 12764ba

Browse files
authored
Merge pull request #70 from ssoelvsten/fork/dev-integrity/clean-lib-exports
Improve lib record export syntax
2 parents d3b46ae + 5ea5443 commit 12764ba

File tree

9 files changed

+123
-143
lines changed

9 files changed

+123
-143
lines changed

lib/Hash.trp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,13 @@ let
6868

6969
(*--- Module ---*)
7070
val Hash = {
71-
hashString = hashString,
72-
hashMultiplyShift = hashMultiplyShift,
73-
hashInt = hashInt,
74-
hashNumber = hashNumber,
75-
hashList = hashList,
76-
hash = hash
71+
hashString,
72+
hashMultiplyShift,
73+
hashInt,
74+
hashNumber,
75+
hashList,
76+
hash
7777
}
7878

79-
in [ ("Hash", Hash)
80-
, ("hash", hash)
81-
]
79+
in [ ("Hash", Hash), ("hash", hash) ]
8280
end

lib/HashMap.trp

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -202,24 +202,20 @@ let (* NOTE: The map is implemented as a Hash Array Mapped Trie (HAMT), i.e. a p
202202

203203
(*--- Module ---*)
204204
val HashMap = {
205-
(* Construction *)
206-
empty = empty,
207-
singleton = singleton,
208-
insert = insert,
209-
remove = remove,
210-
(* Queries *)
211-
null = null,
212-
size = size,
213-
findOpt = findOpt,
214-
find = find,
215-
mem = mem,
216-
(* Manipulation *)
217-
fold = fold,
218-
(* List Conversion*)
219-
keys = keys,
220-
values = values,
221-
toList = toList,
222-
fromList = fromList
205+
empty,
206+
singleton,
207+
insert,
208+
remove,
209+
null,
210+
size,
211+
findOpt,
212+
find,
213+
mem,
214+
fold,
215+
keys,
216+
values,
217+
toList,
218+
fromList
223219
}
224220

225221
in [ ("HashMap", HashMap) ]

lib/HashSet.trp

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,17 @@ let (* NOTE: The set is implemented as a HashMap with dummy values, `()`. This i
4747

4848
(*--- Module ---*)
4949
val HashSet = {
50-
(* Construction *)
51-
empty = empty,
52-
singleton = singleton,
53-
insert = insert,
54-
remove = remove,
55-
(* Queries *)
56-
null = null,
57-
size = size,
58-
mem = mem,
59-
(* Manipulation *)
60-
fold = fold,
61-
(* List Conversion*)
62-
elems = elems,
63-
toList = toList,
64-
fromList = fromList
50+
empty,
51+
singleton,
52+
insert,
53+
remove,
54+
null,
55+
size,
56+
mem,
57+
fold,
58+
elems,
59+
toList,
60+
fromList
6561
}
6662

6763
in [ ("HashSet", HashSet) ]

lib/List.trp

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -169,33 +169,26 @@ let (* -- List Access -- *)
169169

170170
(*--- Module ---*)
171171
val List = {
172-
head = head,
173-
tail = tail,
174-
nth = nth,
175-
176-
null = null,
177-
elem = elem,
178-
length = length,
179-
180-
reverse = reverse,
181-
append = append,
182-
revAppend = revAppend,
183-
appendAt = appendAt,
184-
sublist = sublist,
185-
186-
map = map,
187-
mapi = mapi,
188-
foldl = foldl,
189-
filter = filter,
190-
filteri = filteri,
191-
partition = partition,
192-
193-
range = range,
194-
195-
sort = sort
172+
head,
173+
tail,
174+
nth,
175+
null,
176+
elem,
177+
length,
178+
reverse,
179+
append,
180+
revAppend,
181+
appendAt,
182+
sublist,
183+
map,
184+
mapi,
185+
foldl,
186+
filter,
187+
filteri,
188+
partition,
189+
range,
190+
sort
196191
}
197192

198-
in [ ("List", List),
199-
("length", length)
200-
]
193+
in [ ("List", List), ("length", length) ]
201194
end

lib/ListPair.trp

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,19 @@ let (* -- ListPair Generation -- *)
6464

6565
(*--- Module ---*)
6666
val ListPair = {
67-
zip = zip,
68-
unzip = unzip,
69-
70-
null = null,
71-
length = length,
72-
73-
reverse = reverse,
74-
append = append,
75-
revAppend = revAppend,
76-
77-
findOpt = findOpt,
78-
find = find,
79-
mem = mem,
80-
81-
map = map,
82-
foldl = foldl
67+
zip,
68+
unzip,
69+
null,
70+
length,
71+
reverse,
72+
append,
73+
revAppend,
74+
findOpt,
75+
find,
76+
mem,
77+
map,
78+
foldl
8379
}
8480

85-
in [ ("ListPair", ListPair) ] end
81+
in [ ("ListPair", ListPair) ]
82+
end

lib/Number.trp

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,26 @@ let (** Largest (safe) possible integral value. Anything larger than this cannot
9393

9494
(*--- Module ---*)
9595
val Number = {
96-
maxInt = maxInt,
97-
minInt = minInt,
98-
precision = precision,
99-
maxInt32 = maxInt32,
100-
minInt32 = minInt32,
101-
maxNum = maxNum,
102-
minNum = minNum,
103-
abs = abs,
104-
min = min,
105-
max = max,
106-
ceil = ceil,
107-
floor = floor,
108-
round = round,
109-
sqrt = sqrt,
110-
isInt = isInt,
111-
toInt = toInt,
112-
toInt32 = toInt32,
113-
toString = toString,
114-
fromString = fromString
96+
maxInt,
97+
minInt,
98+
precision,
99+
maxInt32,
100+
minInt32,
101+
maxNum,
102+
minNum,
103+
abs,
104+
min,
105+
max,
106+
ceil,
107+
floor,
108+
round,
109+
sqrt,
110+
isInt,
111+
toInt,
112+
toInt32,
113+
toString,
114+
fromString
115115
}
116+
116117
in [("Number", Number)]
117118
end

lib/StencilVector.trp

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -146,26 +146,24 @@ let (*--- Constants ---*)
146146

147147
(* TODO: Lift list functions `mapi`, `find` and `filter`? *)
148148

149+
(*--- Module ---*)
149150
val StencilVector = {
150-
(* Constants *)
151-
maskBits = maskBits,
152-
maskMax = maskMax,
153-
(* Functions *)
154-
empty = empty,
155-
singleton = singleton,
156-
get = get,
157-
getOrDefault = getOrDefault,
158-
set = set,
159-
unset = unset,
160-
mem = mem,
161-
valid = valid,
162-
null = null,
163-
mask = mask,
164-
length = length,
165-
map = map,
166-
fold = fold
151+
maskBits,
152+
maskMax,
153+
empty,
154+
singleton,
155+
get,
156+
getOrDefault,
157+
set,
158+
unset,
159+
mem,
160+
valid,
161+
null,
162+
mask,
163+
length,
164+
map,
165+
fold
167166
}
168-
in (* Export public functions *)
169-
[ ("StencilVector", StencilVector)
170-
]
167+
168+
in [ ("StencilVector", StencilVector) ]
171169
end

lib/String.trp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,18 @@ let (** The maximum length of a string.
7070

7171
(*--- Module ---*)
7272
val String = {
73-
maxSize = maxSize,
74-
size = size,
75-
sub = sub,
76-
subCode = subCode,
77-
substring = substring,
78-
concat = concat,
79-
concatWith = concatWith,
80-
implode = implode,
81-
explode = explode,
82-
map = map,
83-
translate = translate
73+
maxSize,
74+
size,
75+
sub,
76+
subCode,
77+
substring,
78+
concat,
79+
concatWith,
80+
implode,
81+
explode,
82+
map,
83+
translate
8484
}
85+
8586
in [("String", String)]
8687
end

lib/Unit.trp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ let
112112

113113
(*--- Module ---*)
114114
val Unit = {
115-
group = group,
116-
it = it,
117-
isEq = isEq,
118-
isTrue = isTrue,
119-
isFalse = isFalse,
120-
isNeq = isNeq,
121-
run = run
115+
group,
116+
it,
117+
isEq,
118+
isTrue,
119+
isFalse,
120+
isNeq,
121+
run
122122
}
123123

124124
in [ ("Unit", Unit) ]

0 commit comments

Comments
 (0)