From d006ae0c0efad6a180066b65d1116dc88b08984e Mon Sep 17 00:00:00 2001 From: jackfoxy Date: Sun, 26 Nov 2023 08:00:03 -0800 Subject: [PATCH] more block comment tests --- urql/tests/lib/parse-sans.hoon | 83 +++------------------------------- urql/tests/lib/parse.hoon | 32 +++++++------ 2 files changed, 26 insertions(+), 89 deletions(-) diff --git a/urql/tests/lib/parse-sans.hoon b/urql/tests/lib/parse-sans.hoon index 9d2e9b5..1f7feb5 100755 --- a/urql/tests/lib/parse-sans.hoon +++ b/urql/tests/lib/parse-sans.hoon @@ -9,84 +9,15 @@ ++ m-cmnt-3 "\0a/* linea1 \0a lineb2 \0a linec3 \0a*/" -++ test-multiline-cmnt-00 - =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] - =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] +++ test-block-cmnt-00 %+ expect-eq - !> ~[expected1 expected2] - !> %- parse:parse(default-database 'other-db') - %- zing - %- limo :~ m-cmnt-1 - "cReate" - m-cmnt-2 - " namespace ns1\0a" - " ; \0a" - "cReate namesPace db1.db1-ns1\0a" - m-cmnt-3 - == -++ test-multiline-cmnt-01 - =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] - =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] - %+ expect-eq - !> ~[expected1 expected2] - !> %- parse:parse(default-database 'other-db') - %- zing - %- limo :~ "cReate\0a" - m-cmnt-1 - " namespace ns1\0a" - m-cmnt-2 - " ; \0a" - m-cmnt-3 - "cReate namesPace db1.db1-ns1\0a" - == + !> ~ + !> %- parse:parse(default-database 'other-db') ~ -++ test-multiline-cmnt-02 - =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] - =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] +++ test-block-cmnt-01 %+ expect-eq - !> ~[expected1 expected2] - !> %- parse:parse(default-database 'other-db') - %- zing - %- limo :~ m-cmnt-1 - "\0acReate\0a" - " namespace ns1\0a" - m-cmnt-2 - m-cmnt-3 - " ; \0a" - "cReate namesPace db1.db1-ns1\0a" - == - -++ test-multiline-cmnt-03 - =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] - =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] - %+ expect-eq - !> ~[expected1 expected2] - !> %- parse:parse(default-database 'other-db') - %- zing - %- limo :~ "cReate\0a" - " namespace ns1\0a" - m-cmnt-1 - " ; \0a" - m-cmnt-2 - "cReate namesPace db1.db1-ns1\0a" - m-cmnt-3 - == - -++ test-multiline-cmnt-04 - =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] - =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] - %+ expect-eq - !> ~[expected1 expected2] - !> %- parse:parse(default-database 'other-db') - %- zing - %- limo :~ "cReate\0a" - " namespace ns1\0a" - m-cmnt-1 - " ; " - m-cmnt-2 - "cReate namesPace db1.db1-ns1" - m-cmnt-3 - == + !> ~ + !> %- parse:parse(default-database 'other-db') %- zing ~[m-cmnt-1] ++ vfas-tar [%selected-value value=[p=~.t q=10.799] alias=~] ++ vhep-hep [%selected-value value=[p=~.t q=11.565] alias=~] @@ -107,7 +38,7 @@ ++ t2 [%transform ctes=~ set-functions=[q2 ~ ~]] ++ t3 [%transform ctes=~ set-functions=[q3 ~ ~]] -++ test-multiline-cmnt-005 +++ test-block-cmnt-005 %+ expect-eq !> ~[t1 t2 t3] !> %- parse:parse(default-database 'other-db') diff --git a/urql/tests/lib/parse.hoon b/urql/tests/lib/parse.hoon index 0283193..9eee68c 100755 --- a/urql/tests/lib/parse.hoon +++ b/urql/tests/lib/parse.hoon @@ -2370,16 +2370,22 @@ !> (parse:parse(default-database 'db1') query) :: to do: tests for merge to new file :: -:: multiline comment +:: block comment :: -++ m-cmnt-1 - "/* line1\0a line2 \0a line3\0a*/" -++ m-cmnt-2 - "\0a/* linea\0a lineb \0a linec \0a*/" -++ m-cmnt-3 - "\0a/* linea1 \0a lineb2 \0a linec3 \0a*/" +++ test-block-cmnt-00 + %+ expect-eq + !> ~ + !> %- parse:parse(default-database 'other-db') ~ :: -++ test-multiline-cmnt-00 +++ m-cmnt-1 "/* line1\0a line2 \0a line3\0a*/" +++ m-cmnt-2 "\0a/* linea\0a lineb \0a linec \0a*/" +++ m-cmnt-3 "\0a/* linea1 \0a lineb2 \0a linec3 \0a*/" +:: +++ test-block-cmnt-01 + %+ expect-eq + !> ~ + !> %- parse:parse(default-database 'other-db') %- zing ~[m-cmnt-1] +++ test-block-cmnt-02 =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] %+ expect-eq @@ -2394,7 +2400,7 @@ "cReate namesPace db1.db1-ns1\0a" m-cmnt-3 == -++ test-multiline-cmnt-01 +++ test-block-cmnt-03 =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] %+ expect-eq @@ -2410,7 +2416,7 @@ "cReate namesPace db1.db1-ns1\0a" == -++ test-multiline-cmnt-02 +++ test-block-cmnt-04 =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] %+ expect-eq @@ -2426,7 +2432,7 @@ "cReate namesPace db1.db1-ns1\0a" == -++ test-multiline-cmnt-03 +++ test-block-cmnt-05 =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] %+ expect-eq @@ -2442,7 +2448,7 @@ m-cmnt-3 == -++ test-multiline-cmnt-04 +++ test-block-cmnt-06 =/ expected1 [%create-namespace database-name='other-db' name='ns1' as-of=~] =/ expected2 [%create-namespace database-name='db1' name='db1-ns1' as-of=~] %+ expect-eq @@ -2477,7 +2483,7 @@ ++ t2 [%transform ctes=~ set-functions=[q2 ~ ~]] ++ t3 [%transform ctes=~ set-functions=[q3 ~ ~]] :: -++ test-multiline-cmnt-05 +++ test-block-cmnt-07 %+ expect-eq !> ~[t1 t2 t3] !> %- parse:parse(default-database 'other-db')