source-academy / py-slang / 33248548384

86%

push

github

Fix pair()/llist() chains misconverting into a nested module ARRAY (#450)

* Fix pair()/llist() chains misconverting into a nested module ARRAY

llist(a, b) builds nested cons cells - { list: [a, { list: [b, { none }] }] } -
not the flat { list: [a, b] } a literal [a, b] produces (py2js: [a, [b, null]]
vs. [a, b]). pythonToModule's list/array conversion mapped the raw JS array
1:1 regardless, so a chain crossed into a module as a 2-element ARRAY whose
second element was itself a nested sub-list, instead of the list's actual
elements - e.g. consecutively(llist(piano(60, 1), piano(64, 1))) in the sound
module received [sound1, [sound2, EMPTY_LIST]] instead of [sound1, sound2].

isProperList (already used by head/tail/_print_llist) now gates a flattening
walk that only fires for a genuine chain terminating in None - a flat literal
list of any length, or a raw 2-tuple like a round-tripped module PAIR, takes
the exact same path as before, unchanged.

Fixes source-academy/modules#931.

* Apply prettier formatting

4843 of 6081 branches covered (79.64%)

Branch coverage included in aggregate %.

19 of 19 new or added lines in 3 files covered. (100.0%)

10841 of 12236 relevant lines covered (88.6%)

161435.18 hits per line