From c55240fb05151cae046c75a793c164d72c988db2 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 6 Jan 2017 18:46:58 +0300
Subject: Tests cleanup (take 2)

---
 unit-tests/lexer/comment.test | 221 ++++++++++++++++++++++++------------------
 1 file changed, 124 insertions(+), 97 deletions(-)

(limited to 'unit-tests/lexer/comment.test')

diff --git a/unit-tests/lexer/comment.test b/unit-tests/lexer/comment.test
index 025b0a2..6840219 100644
--- a/unit-tests/lexer/comment.test
+++ b/unit-tests/lexer/comment.test
@@ -2,111 +2,138 @@
 # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-# Single-line comments.
+: single-line
+:
+{
+  : only
+  :
+  $* <<EOI >>:EOO
+  # comment
+  EOI
+  EOO
 
-$* <<EOI >>:EOO # single-only
-# comment
-EOI
-EOO
+  : first
+  :
+  $* <<EOI >>EOO
+  # comment
+  foo
+  EOI
+  'foo'
+  <newline>
+  EOO
 
-$* <<EOI >>EOO # single-first
-# comment
-foo
-EOI
-'foo'
-<newline>
-EOO
+  : last
+  :
+  $* <<EOI >>EOO
+  foo
+  # comment
+  EOI
+  'foo'
+  <newline>
+  EOO
 
-$* <<EOI >>EOO # single-last
-foo
-# comment
-EOI
-'foo'
-<newline>
-EOO
+  : few
+  :
+  $* <<EOI >>EOO
+  foo
+  # comment
+  # comment
+  EOI
+  'foo'
+  <newline>
+  EOO
 
-$* <<EOI >>EOO # single-few
-foo
-# comment
-# comment
-EOI
-'foo'
-<newline>
-EOO
+  : cont
+  :
+  $* <<EOI >>EOO
+  foo
+  # comment\\
+  bar
+  EOI
+  'foo'
+  <newline>
+  'bar'
+  <newline>
+  EOO
 
-$* <<EOI >>EOO # single-cont
-foo
-# comment\\
-bar
-EOI
-'foo'
-<newline>
-'bar'
-<newline>
-EOO
+  : same
+  :
+  $* <<EOI >>EOO
+  foo # comment
+  bar # comment
+  EOI
+  'foo'
+  <newline>
+  'bar'
+  <newline>
+  EOO
+}
 
-$* <<EOI >>EOO # single-same
-foo # comment
-bar # comment
-EOI
-'foo'
-<newline>
-'bar'
-<newline>
-EOO
+: multi-line
+:
+{
+  : only
+  :
+  $* <<EOI >>:EOO
+  #\
+  comment
+  comment
+  #\
+  EOI
+  EOO
 
-# Multi-line comments.
-#
+  : empty
+  :
+  $* <<EOI >>:EOO
+  #\
+  #\
+  EOI
+  EOO
 
-$* <<EOI >>:EOO # multi-only
-#\
-comment
-comment
-#\
-EOI
-EOO
+  : start-same
+  :
+  $* <<EOI >>EOO
+  foo #\
+  comment
+  comment
+  #\
+  EOI
+  'foo'
+  <newline>
+  EOO
 
-$* <<EOI >>:EOO # multi-empty
-#\
-#\
-EOI
-EOO
+  : end-same
+  :
+  $* <<EOI >>EOO
+  #\
+  comment
+  comment
+  foo #\
+  bar
+  EOI
+  'bar'
+  <newline>
+  EOO
 
-$* <<EOI >>EOO # multi-start-same
-foo #\
-comment
-comment
-#\
-EOI
-'foo'
-<newline>
-EOO
+  : end-not
+  :
+  $* <<EOI >>EOO
+  #\
+  comment
+  #\ not an end
+  foo #\
+  bar
+  EOI
+  'bar'
+  <newline>
+  EOO
 
-$* <<EOI >>EOO # multi-end-same
-#\
-comment
-comment
-foo #\
-bar
-EOI
-'bar'
-<newline>
-EOO
-
-$* <<EOI >>EOO # multi-end-not
-#\
-comment
-#\ not an end
-foo #\
-bar
-EOI
-'bar'
-<newline>
-EOO
-
-$* <<EOI 2>>EOE != 0 # multi-unterm
-#\
-comment
-EOI
-stdin:3:1: error: unterminated multi-line comment
-EOE
+  : unterm
+  :
+  $* <<EOI 2>>EOE != 0
+  #\
+  comment
+  EOI
+  stdin:3:1: error: unterminated multi-line comment
+  EOE
+}
-- 
cgit v1.1