Skip to content

Commit 15ea724

Browse files
committed
fix: format code
1 parent eb24e38 commit 15ea724

File tree

6 files changed

+42
-52
lines changed

6 files changed

+42
-52
lines changed

Cli.ark

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
(let required (= kind "value"))
77
(let value default)
88

9-
(fun (
10-
&kind
9+
(fun (&kind
1110
&name
1211
&desc
1312
&default
@@ -17,42 +16,35 @@
1716
(let _group (fun (children all_of) {
1817
(let kind "group")
1918

20-
(fun (
21-
&kind
19+
(fun (&kind
2220
&children
2321
&all_of) ()) }))
2422

2523
# @brief Defines a command line flag
2624
# @details All flags are optional and turned off
2725
# @param name how the flag is named, eg "--debug"
2826
# @param desc what the flag achieves
29-
(let flag (fun (name desc)
30-
(_param name desc false "flag")))
27+
(let flag (fun (name desc) (_param name desc false "flag")))
3128

3229
# @brief Defines a command line value
3330
# @details All values are required and equal to their default value
3431
# @param name how the value is named, eg "filename"
3532
# @param desc what the value is for
3633
# @param default default value for the value
37-
(let value (fun (name desc default)
38-
(_param name desc default "value")))
34+
(let value (fun (name desc default) (_param name desc default "value")))
3935

4036
# @brief Creates a group of flags/values/groups where only one of the subgroup has to match
4137
# @param params list of flags/values/groups
42-
(let oneOf (fun (params)
43-
(_group params false)))
38+
(let oneOf (fun (params) (_group params false)))
4439

4540
# @brief Creates a group of flags/values/groups where all of the subgroups have to match
4641
# @param params list of flags/values/groups
47-
(let group (fun (params)
48-
(_group params true)))
42+
(let group (fun (params) (_group params true)))
4943

5044
(let _synopsis_group (fun (cli)
5145
(if cli.all_of
5246
{
53-
(let partially_fmt (map
54-
cli.children
55-
(fun (param) (_format_param param))))
47+
(let partially_fmt (map cli.children (fun (param) (_format_param param))))
5648

5749
(mut options [""])
5850
(mut i 0)
@@ -61,29 +53,25 @@
6153
(let e (@ partially_fmt i))
6254
(if (= (type e) "String")
6355
(set options (map
64-
options
65-
(fun (alt)
66-
(if (empty? alt)
67-
e
68-
(format "{} {}" alt e)))))
56+
options
57+
(fun (alt)
58+
(if (empty? alt)
59+
e
60+
(format "{} {}" alt e)))))
6961
# if we have a list, add (@ options 0) to each element of the list, then added to options
7062
(concat! options (map e (fun (alt) (format "{} {}" (@ options 0) alt)))))
7163
(set i (+ 1 i)) })
7264

73-
options
74-
}
65+
options }
7566
# any_of, return a list of each formatted param
76-
(flatMap
77-
cli.children
78-
(fun (param) (_format_param param))))))
67+
(flatMap cli.children (fun (param) (_format_param param))))))
7968

8069
(let _synopsis_flag (fun (param)
8170
(if param.required
8271
(format "{}" cli.name)
8372
(format "[{}]" cli.name))))
8473

85-
(let _synopsis_value (fun (param)
86-
(format "<{}>" cli.name)))
74+
(let _synopsis_value (fun (param) (format "<{}>" cli.name)))
8775

8876
(let _format_param (fun (cli)
8977
(if (= cli.kind "group")
@@ -95,9 +83,7 @@
9583

9684
(let _get_options (fun (d param)
9785
(if (= param.kind "group")
98-
(forEach
99-
param.children
100-
(fun (p) (_get_options d p)))
86+
(forEach param.children (fun (p) (_get_options d p)))
10187
(dict:add d param.name param))))
10288

10389
(let help (fun (program desc cli) {
@@ -109,11 +95,16 @@
10995
(let params (dict))
11096
(_get_options params cli)
11197
(let options (join
112-
(map (dict:keys params) (fun (name) {
113-
(let param (dict:get params name))
114-
(let fmt_name (if (= param.kind "value") (format "<{}>" name) name))
115-
(format "\t{:<28} {}" fmt_name param.desc) }))
116-
"\n"))
98+
(map
99+
(dict:keys params)
100+
(fun (name) {
101+
(let param (dict:get params name))
102+
(let fmt_name
103+
(if (= param.kind "value")
104+
(format "<{}>" name)
105+
name))
106+
(format "\t{:<28} {}" fmt_name param.desc) }))
107+
"\n"))
117108

118109
(+ headers synopsis "\n\nOPTIONS\n" options) }))
119110

@@ -198,12 +189,12 @@
198189
(if (= cli.kind "flag")
199190
{
200191
(let maybe_flag (find args cli.name))
201-
(if (!= maybe_flag -1)
202-
(dict:add parsed cli.name true)) }
192+
(if (!= maybe_flag -1) (dict:add parsed cli.name true)) }
203193
(if (= cli.kind "value")
204194
(dict:add parsed cli.name (head args))
205195
# group
206-
(if cli.all_of (_match_group parsed args cli) (_match_one_of parsed args cli))))
196+
(if cli.all_of
197+
(_match_group parsed args cli)
198+
(_match_one_of parsed args cli))))
207199

208200
parsed }))
209-

Dict.ark

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
(while (< _i (len _keys)) {
134134
(let _key (@ _keys _i))
135135
(add _D _key (_f _key (get _D _key)))
136-
(set _i (+ 1 _i)) })}))
136+
(set _i (+ 1 _i)) }) }))
137137

138138
# @brief Iterate over the pairs of a dictionary with a given function
139139
# @param _D dictionary
@@ -151,7 +151,7 @@
151151
(while (< _i (len _keys)) {
152152
(let _key (@ _keys _i))
153153
(_f _key (get _D _key))
154-
(set _i (+ 1 _i)) })}))
154+
(set _i (+ 1 _i)) }) }))
155155

156156
# @brief Filter a dictionary with a predicate
157157
# @details The original dictionary is not modified
@@ -171,8 +171,7 @@
171171
(while (< _i (len _keys)) {
172172
(let _key (@ _keys _i))
173173
(let _val (get _D _key))
174-
(if (_f _key _val)
175-
(add _new _key _val))
174+
(if (_f _key _val) (add _new _key _val))
176175
(set _i (+ 1 _i)) })
177176
_new }))
178177

@@ -192,8 +191,7 @@
192191
(while (< _i (len _keys)) {
193192
(let _key (@ _keys _i))
194193
(let _val (get _D _key))
195-
(if (not (_f _key _val))
196-
(remove _D _key))
194+
(if (not (_f _key _val)) (remove _D _key))
197195
(set _i (+ 1 _i)) }) }))
198196

199197
# @brief Copy a dictionary
@@ -234,4 +232,4 @@
234232
(while (< _i (len _keys)) {
235233
(let _key (@ _keys _i))
236234
(add _D _key (get _D2 _key))
237-
(set _i (+ 1 _i)) })}))
235+
(set _i (+ 1 _i)) }) }))

List.ark

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,4 +613,4 @@
613613

614614
(if (>= (+ _i _size) (len _L))
615615
(set _i (len _L)))
616-
(set _i (+ 1 _i)) })}))
616+
(set _i (+ 1 _i)) }) }))

Math.ark

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,4 +409,3 @@
409409
(set _i (+ 1 _i)) })
410410

411411
_result }))
412-

Random.ark

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@
3131
(pop! _L _idx) })
3232

3333
_output }))
34-

String.ark

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# @brief Upper and lowercase ASCII letters
22
# @author https://github.com/SuperFola
3-
(let asciiLetters "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
3+
(let asciiLetters
4+
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
45

56
# @brief Lowercase ASCII letters
67
# @author https://github.com/SuperFola
@@ -24,11 +25,13 @@
2425

2526
# @brief All printable characters
2627
# @author https://github.com/SuperFola
27-
(let printable "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r")
28+
(let printable
29+
"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ \t\n\r")
2830

2931
# @brief Punctuation characters
3032
# @author https://github.com/SuperFola
31-
(let punctuation "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~")
33+
(let punctuation
34+
"!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~")
3235

3336
# @brief Whitespace characters
3437
# @author https://github.com/SuperFola

0 commit comments

Comments
 (0)