1 files changed, 79 insertions, 66 deletions
diff --git a/unit-tests/lexer/quoting.test b/unit-tests/lexer/quoting.test
index 84818fc..a44d6af 100644
--- a/unit-tests/lexer/quoting.test
+++ b/unit-tests/lexer/quoting.test
@@ -11,81 +11,94 @@ $* <'foo' >>EOO
 <newline>
 EOO
 
-: single-comp
+: comp
 :
-$* <":'foo':" >>EOO
-:
-'foo' [S/C]
-:
-<newline>
-EOO
+{
+  : single
+  :
+  $* <":'foo':" >>EOO
+  :
+  'foo' [S/C]
+  :
+  <newline>
+  EOO
 
-: double-comp
-:
-$* <':"foo":' >>EOO
-:
-'foo' [D/C]
-:
-<newline>
-EOO
+  : double
+  :
+  $* <':"foo":' >>EOO
+  :
+  'foo' [D/C]
+  :
+  <newline>
+  EOO
 
-: single-empty-comp
-:
-$* <"''" >>EOO
-'' [S/C]
-<newline>
-EOO
+  : single-empty
+  :
+  $* <"''" >>EOO
+  '' [S/C]
+  <newline>
+  EOO
 
-: double-empty-comp
-:
-$* <'""' >>EOO
-'' [D/C]
-<newline>
-EOO
+  : double-empty
+  :
+  $* <'""' >>EOO
+  '' [D/C]
+  <newline>
+  EOO
+}
 
-: part-start-quoted
-: Token start already quoted
-:
-$* <'"$foo"' >>EOO
-'' [D/P]
-$ [D/C]
-'foo' [D/P]
-<newline>
-EOO
+: part
+{
+  : quoted
+  {
+    : start
+    : Token start already quoted
+    :
+    $* <'"$foo"' >>EOO
+    '' [D/P]
+    $ [D/C]
+    'foo' [D/P]
+    <newline>
+    EOO
 
-: part-end-quoted
-: Token end still quoted
-:
-$* <'"foo$"' >>EOO
-'foo' [D/P]
-$ [D/C]
-'' [D/P]
-<newline>
-EOO
+    : end
+    : Token end still quoted
+    :
+    $* <'"foo$"' >>EOO
+    'foo' [D/P]
+    $ [D/C]
+    '' [D/P]
+    <newline>
+    EOO
+  }
 
-: part-start-unquoted
-: Token starts with unquoted character
-:
-$* <'f"oo"' >>EOO
-'foo' [D/P]
-<newline>
-EOO
+  : unquoted
+  {
+    : start
+    : Token starts with unquoted character
+    :
+    $* <'f"oo"' >>EOO
+    'foo' [D/P]
+    <newline>
+    EOO
 
-: part-unquoted
-: Token continous with unquoted character
-:
-$* <'"fo"o' >>EOO
-'foo' [D/P]
-<newline>
-EOO
+    : end
+    : Token continous with unquoted character
+    :
+    $* <'"fo"o' >>EOO
+    'foo' [D/P]
+    <newline>
+    EOO
 
-: part-unquoted-escape
-: Token continous with unquoted escaped character
-:
-$* <'"fo"\"' >>EOO
-'fo"' [D/P]
-<newline>
-EOO
+    : escape
+    : Token continous with unquoted escaped character
+    :
+    $* <'"fo"\"' >>EOO
+    'fo"' [D/P]
+    <newline>
+    EOO
+  }
+}
 
 : mixed
 :