From cbe63bd8b26177fcd1b25e9f5b92f69608bd29ce Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Sun, 30 Nov 2014 00:05:33 +0100 Subject: mds-kbdc: fix nesting inside unordered MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- .../valid/alternation_inside_unordered | 37 +++++- .../simplify-tree/valid/unordered_inside_unordered | 136 ++++++++++++++++++++- 2 files changed, 171 insertions(+), 2 deletions(-) (limited to 'test-files/mds-kbdc/simplify-tree/valid') diff --git a/test-files/mds-kbdc/simplify-tree/valid/alternation_inside_unordered b/test-files/mds-kbdc/simplify-tree/valid/alternation_inside_unordered index da3d3d2..b1a9524 100644 --- a/test-files/mds-kbdc/simplify-tree/valid/alternation_inside_unordered +++ b/test-files/mds-kbdc/simplify-tree/valid/alternation_inside_unordered @@ -1,4 +1,39 @@ (1 [2 3]) : 0 -# TODO +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 4-5) ‘2’) +# ) +# (.result +# (string (@ 1 12-13) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 6-7) ‘3’) +# ) +# (.result +# (string (@ 1 12-13) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 4-5) ‘2’) +# (string (@ 1 1-2) ‘1’) +# ) +# (.result +# (string (@ 1 12-13) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 1-2) ‘1’) +# ) +# (.result +# (string (@ 1 12-13) ‘0’) +# ) +# ) diff --git a/test-files/mds-kbdc/simplify-tree/valid/unordered_inside_unordered b/test-files/mds-kbdc/simplify-tree/valid/unordered_inside_unordered index ce999a2..e312725 100644 --- a/test-files/mds-kbdc/simplify-tree/valid/unordered_inside_unordered +++ b/test-files/mds-kbdc/simplify-tree/valid/unordered_inside_unordered @@ -1,4 +1,138 @@ (1 2 (3 4)) : 0 -# TODO +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 8-9) ‘4’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 6-7) ‘3’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 3-4) ‘2’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 3-4) ‘2’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 8-9) ‘4’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 6-7) ‘3’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 1-2) ‘1’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 1-2) ‘1’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 3-4) ‘2’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 1-2) ‘1’) +# (string (@ 1 3-4) ‘2’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 1-2) ‘1’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# (map (@ 1 0-0) +# (.sequence +# (string (@ 1 8-9) ‘4’) +# (string (@ 1 6-7) ‘3’) +# (string (@ 1 3-4) ‘2’) +# (string (@ 1 1-2) ‘1’) +# ) +# (.result +# (string (@ 1 14-15) ‘0’) +# ) +# ) +# :1:5–6: warning: unordered subsequence inside unordered subsequence is discouraged +# (1 2 (3 4)) : 0 +# ^ -- cgit v1.2.3-70-g09d2