From 1ef12a515fcf4334725767e09d11583301a5153b Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 25 Nov 2016 15:17:53 +0200
Subject: Adjust for literal here-document support in testscript

---
 tests/compiler/sloc-counter/driver.cxx | 30 +++++++++++++++++-------------
 tests/compiler/sloc-counter/testscript | 14 ++++++--------
 2 files changed, 23 insertions(+), 21 deletions(-)

(limited to 'tests/compiler')

diff --git a/tests/compiler/sloc-counter/driver.cxx b/tests/compiler/sloc-counter/driver.cxx
index 9d738b3..d06bfbe 100644
--- a/tests/compiler/sloc-counter/driver.cxx
+++ b/tests/compiler/sloc-counter/driver.cxx
@@ -3,6 +3,8 @@
 // license   : MIT; see accompanying LICENSE file
 
 #include <fstream>
+#include <sstream>
+#include <cassert>
 #include <iostream>
 
 #include <cutl/compiler/code-stream.hxx>
@@ -14,23 +16,25 @@ using namespace cutl::compiler;
 int
 main (int argc, char* argv[])
 {
-  if (argc != 2)
-  {
-    cerr << "usage: " << argv[0] << " <file>" << endl;
-    return 1;
-  }
+  ifstream ifs;
+
+  if (argc > 1)
+    ifs.open (argv[1]);
 
-  ostream_filter<sloc_counter, char> filt (cout);
+  istream& in (ifs.is_open () ? ifs : cin);
 
-  ifstream ifs (argv[1]);
+  ostringstream os1, os2;
+  ostream_filter<sloc_counter, char> filt (os1);
 
-  for (istream::int_type c (ifs.get ());
-       c != istream::traits_type::eof ();
-       c = ifs.get ())
+  for (istream::int_type i (in.get ());
+       i != istream::traits_type::eof ();
+       i = in.get ())
   {
-    cout.put (istream::traits_type::to_char_type (c));
+    char c (istream::traits_type::to_char_type (i));
+    os1.put (c);
+    os2.put (c);
   }
 
-  cout << endl
-       << filt.stream ().count () << endl;
+  assert (os1.str () == os2.str ());
+  cout << filt.stream ().count () << endl;
 }
diff --git a/tests/compiler/sloc-counter/testscript b/tests/compiler/sloc-counter/testscript
index 802d406..841c4c3 100644
--- a/tests/compiler/sloc-counter/testscript
+++ b/tests/compiler/sloc-counter/testscript
@@ -2,9 +2,12 @@
 # copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
 # license   : MIT; see accompanying LICENSE file
 
+# @@ BUG: adding blank lines at the end increases the count.
+
 : c++-program-sloc
 :
-text = '// C++ comment
+$* <<EOI >'19'
+// C++ comment
   // C++ comment
 
 /* C comment */
@@ -37,10 +40,5 @@ int main(
   /* tricky stuff *//
   2;
   cerr << "Hello, \"world!" << '"'\\''"' << endl;
-}';
-cat <"$text" >>>file;
-$* file >>EOO
-$text
-
-18
-EOO
+}
+EOI
-- 
cgit v1.1