Skip to content

Commit 49dfed2

Browse files
Alonely0Alonely0
committed
chore(parser): format tests
1 parent 4b6a76e commit 49dfed2

2 files changed

Lines changed: 43 additions & 91 deletions

File tree

‎parser/src/sexpr.rs‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,31 @@ impl Debug for Statement<'_> {
7272
update,
7373
body,
7474
} => {
75+
write!(f, "(for")?;
7576
if alt {
76-
write!(f, "(for")?;
7777
let write_fragment = |f: &mut Formatter, x: Option<&dyn Debug>| {
7878
if let Some(x) = x {
7979
write!(f, "\n{pad}{x:?}")
8080
} else {
81-
write!(f, "\n{pad}None")
81+
write!(f, "\n{pad}(pass)")
8282
}
8383
};
8484
write_fragment(f, init.as_ref().map(|x| x as _))?;
8585
write_fragment(f, condition.as_ref().map(|x| x as _))?;
8686
write_fragment(f, update.as_ref().map(|x| x as _))?;
8787
write!(f, "\n{pad}{body:#ni$?})")
8888
} else {
89-
write!(f, "(for {init:?} {condition:?} {update:?} {body:?})")
89+
let write_fragment = |f: &mut Formatter, x: Option<&dyn Debug>| {
90+
if let Some(x) = x {
91+
write!(f, " {x:?}")
92+
} else {
93+
write!(f, " (pass)")
94+
}
95+
};
96+
write_fragment(f, init.as_ref().map(|x| x as _))?;
97+
write_fragment(f, condition.as_ref().map(|x| x as _))?;
98+
write_fragment(f, update.as_ref().map(|x| x as _))?;
99+
write!(f, " {body:?})")
90100
}
91101
}
92102
Self::ForEach {

‎parser/src/tests.rs‎

Lines changed: 30 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,9 @@ fn test_parser_inc_dec() {
228228
(None, Some("(body (Concat (IncrementL awk::a) (DecrementR (Record 0))))")),
229229
(
230230
None,
231-
Some("(body (Concat (DecrementL (Index awk::a 2)) (IncrementL (Record (Add 1 1)))))")
231+
Some(
232+
"(body (Concat (DecrementL (Index awk::a 2)) (IncrementL (Record (Add 1 1)))))"
233+
)
232234
),
233235
(None, Some("(body (Concat (IncrementR awk::a) (DecrementR (Index awk::a \"x\"))))")),
234236
(None, Some("(body (Concat (DecrementL awk::a) (IncrementR (Record \"a\"))))")),
@@ -252,9 +254,17 @@ fn test_parser_arrays() {
252254
rules: [
253255
(
254256
None,
255-
Some("(body (Index awk::a 1) (Assignment (Index awk::a 1) (Assignment awk::x (Assignment (Index awk::b 2) (Add 2 2)))))")
257+
Some("(body (Index awk::a 1) \
258+
(Assignment (Index awk::a 1) \
259+
(Assignment awk::x (Assignment (Index awk::b 2) (Add 2 2)))))"
260+
)
261+
),
262+
(
263+
None,
264+
Some("(body (IncrementL (Index awk::a 1)) \
265+
(Print (DecrementR (Index awk::b awk::a))))"
266+
)
256267
),
257-
(None, Some("(body (IncrementL (Index awk::a 1)) (Print (DecrementR (Index awk::b awk::a))))")),
258268
(None, Some("(body (AddAssign (Index awk::a 1 2 3 \"a\") 1))")),
259269
(None, Some("(body (Print (In awk::arr awk::a) (In awk::arr 1 2 \"a\")))")),
260270
(None, Some("(body (Print (Record (In awk::a 1 2))))")),
@@ -277,10 +287,10 @@ fn test_parser_for_loop() {
277287
{ for (; i < n; i++) print }
278288
{ for (i = 0; ; i++) print }
279289
{ for (i = 0; i < n;) print }
280-
{ for (; ; i++) print }
290+
{ for (;; i++) print }
281291
{ for (; i < n;) print }
282292
{ for (i = 0; ;) print }
283-
{ for (; ;) print }
293+
{ for (;;) print }
284294
{ for ((i in arr); a; b) print }
285295
{ for (((i, 2) in arr); ;) print }
286296
{ for (k in array) print }
@@ -290,99 +300,31 @@ fn test_parser_for_loop() {
290300
rules: [
291301
(
292302
None,
293-
Some("(body (for \
294-
Some((Assignment awk::i 0)) \
295-
Some((Lt awk::i awk::n)) \
296-
Some((IncrementR awk::i)) \
297-
(body (Print))))"
298-
)
299-
),
300-
(
301-
None,
302-
Some("(body (for \
303-
None \
304-
Some((Lt awk::i awk::n)) \
305-
Some((IncrementR awk::i)) \
306-
(body (Print))))"
307-
)
308-
),
309-
(
310-
None,
311-
Some("(body (for \
312-
Some((Assignment awk::i 0)) \
313-
None \
314-
Some((IncrementR awk::i)) \
315-
(body (Print))))"
316-
)
317-
),
318-
(
319-
None,
320-
Some("(body (for \
321-
Some((Assignment awk::i 0)) \
322-
Some((Lt awk::i awk::n)) \
323-
None \
324-
(body (Print))))"
325-
)
326-
),
327-
(
328-
None,
329-
Some("(body (for \
330-
None \
331-
None \
332-
Some((IncrementR awk::i)) \
333-
(body (Print))))"
334-
)
335-
),
336-
(
337-
None,
338-
Some("(body (for \
339-
None \
340-
Some((Lt awk::i awk::n)) \
341-
None \
342-
(body (Print))))"
343-
)
344-
),
345-
(
346-
None,
347-
Some("(body (for \
348-
Some((Assignment awk::i 0)) \
349-
None \
350-
None \
351-
(body (Print))))"
352-
)
353-
),
354-
(
355-
None,
356-
Some("(body (for \
357-
None \
358-
None \
359-
None \
360-
(body (Print))))"
361-
)
303+
Some("(body (for (Assignment awk::i 0) (Lt awk::i awk::n) (IncrementR awk::i) \
304+
(body (Print))))")
362305
),
363306
(
364307
None,
365-
Some("(body (for \
366-
Some((In awk::arr awk::i)) \
367-
Some(awk::a) \
368-
Some(awk::b) \
369-
(body (Print))))"
370-
)
308+
Some("(body (for (pass) (Lt awk::i awk::n) (IncrementR awk::i) \
309+
(body (Print))))")
371310
),
372311
(
373312
None,
374-
Some("(body (for \
375-
Some((In awk::arr awk::i 2)) \
376-
None \
377-
None \
378-
(body (Print))))"
379-
)
313+
Some("(body (for (Assignment awk::i 0) (pass) (IncrementR awk::i) \
314+
(body (Print))))")
380315
),
381316
(
382317
None,
383-
Some("(body (for-each awk::k awk::array (body (Print))))"
384-
)
318+
Some("(body (for (Assignment awk::i 0) (Lt awk::i awk::n) (pass) \
319+
(body (Print))))")
385320
),
321+
(None, Some("(body (for (pass) (pass) (IncrementR awk::i) (body (Print))))")),
322+
(None, Some("(body (for (pass) (Lt awk::i awk::n) (pass) (body (Print))))")),
323+
(None, Some("(body (for (Assignment awk::i 0) (pass) (pass) (body (Print))))")),
324+
(None, Some("(body (for (pass) (pass) (pass) (body (Print))))")),
325+
(None, Some("(body (for (In awk::arr awk::i) awk::a awk::b (body (Print))))")),
326+
(None, Some("(body (for (In awk::arr awk::i 2) (pass) (pass) (body (Print))))")),
327+
(None, Some("(body (for-each awk::k awk::array (body (Print))))")),
386328
],
387329
}
388330
);

0 commit comments

Comments
 (0)