1 files changed, 66 insertions, 36 deletions
diff --git a/unit-tests/test/script/lexer/variable.test b/unit-tests/test/script/lexer/variable.test
index 0ecc6cc..15458f5 100644
--- a/unit-tests/test/script/lexer/variable.test
+++ b/unit-tests/test/script/lexer/variable.test
@@ -1,40 +1,70 @@
+# file      : unit-tests/test/script/lexer/variable.test
+# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
 # Test handling custom variable names ($*, $~, $NN).
 #
 test.arguments = variable
 
-$* <"*" >>EOO
-'*'
-<newline>
-EOO
-
-$* <"*abc" >>EOO
-'*'
-'abc'
-<newline>
-EOO
-
-$* <"~" >>EOO
-'~'
-<newline>
-EOO
-
-$* <"~123" >>EOO
-'~'
-'123'
-<newline>
-EOO
-
-$* <"0" >>EOO
-'0'
-<newline>
-EOO
-
-$* <"1abc" >>EOO
-'1'
-'abc'
-<newline>
-EOO
-
-$* <"10" 2>>EOE != 0
-stdin:1:1: error: multi-digit special variable name
-EOE
+: command
+:
+{
+  : only
+  :
+  $* <"*" >>EOO
+  '*'
+  <newline>
+  EOO
+
+  : followed
+  :
+  $* <"*abc" >>EOO
+  '*'
+  'abc'
+  <newline>
+  EOO
+}
+
+: working-dir
+:
+{
+  : only
+  :
+  $* <"~" >>EOO
+  '~'
+  <newline>
+  EOO
+
+  : followed
+  :
+  $* <"~123" >>EOO
+  '~'
+  '123'
+  <newline>
+  EOO
+}
+
+: arg
+:
+{
+  : only
+  :
+  $* <"0" >>EOO
+  '0'
+  <newline>
+  EOO
+
+  : followed
+  :
+  $* <"1abc" >>EOO
+  '1'
+  'abc'
+  <newline>
+  EOO
+
+  : multi-digit
+  :
+  $* <"10" 2>>EOE != 0
+  stdin:1:1: error: multi-digit special variable name
+  EOE
+}