remerge

4 files changed, 176 insertions, 0 deletions

diff --git a/libcutl/tests/compiler/sloc-counter/driver.cxx b/libcutl/tests/compiler/sloc-counter/driver.cxx
new file mode 100644
index 0000000..504fbb7
--- /dev/null
+++ b/libcutl/tests/compiler/sloc-counter/driver.cxx
@@ -0,0 +1,36 @@
+// file      : tests/compiler/sloc-counter/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : MIT; see accompanying LICENSE file
+
+#include <fstream>
+#include <iostream>
+
+#include <cutl/compiler/code-stream.hxx>
+#include <cutl/compiler/sloc-counter.hxx>
+
+using namespace std;
+using namespace cutl::compiler;
+
+int
+main (int argc, char* argv[])
+{
+  if (argc != 2)
+  {
+    cerr << "usage: " << argv[0] << " <file>" << endl;
+    return 1;
+  }
+
+  ostream_filter<sloc_counter, char> filt (cout);
+
+  ifstream ifs(argv[1]);
+
+  for (istream::int_type c (ifs.get ());
+       c != istream::traits_type::eof ();
+       c = ifs.get ())
+  {
+    cout.put (istream::traits_type::to_char_type (c));
+  }
+
+  cout << endl
+       << filt.stream ().count () << endl;
+}
diff --git a/libcutl/tests/compiler/sloc-counter/makefile b/libcutl/tests/compiler/sloc-counter/makefile
new file mode 100644
index 0000000..74c9a4a
--- /dev/null
+++ b/libcutl/tests/compiler/sloc-counter/makefile
@@ -0,0 +1,70 @@
+# file      : tests/compiler/sloc-counter/makefile
+# copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+# license   : MIT; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+
+#
+#
+cxx_obj  := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o))
+cxx_od   := $(cxx_obj:.o=.o.d)
+
+cutl.l             := $(out_root)/cutl/cutl.l
+cutl.l.cpp-options := $(out_root)/cutl/cutl.l.cpp-options
+
+driver   := $(out_base)/driver
+test     := $(out_base)/.test
+clean    := $(out_base)/.clean
+
+# Build.
+#
+$(driver): $(cxx_obj) $(cutl.l)
+$(cxx_obj) $(cxx_od): $(cutl.l.cpp-options)
+
+
+$(call include-dep,$(cxx_od))
+
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+
+# Test.
+#
+$(test): driver := $(driver)
+$(test): $(driver) $(src_base)/test.cxx $(src_base)/test.std
+	$(call message,test $$1,$$1 $(src_base)/test.cxx | diff -u $(src_base)/test.std -,$(driver))
+
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))
+
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+
+# How to.
+#
+$(call include,$(bld_root)/cxx/o-e.make)
+$(call include,$(bld_root)/cxx/cxx-o.make)
+$(call include,$(bld_root)/cxx/cxx-d.make)
+
+# Dependencies.
+#
+$(call import,$(src_root)/cutl/makefile)
diff --git a/libcutl/tests/compiler/sloc-counter/test.cxx b/libcutl/tests/compiler/sloc-counter/test.cxx
new file mode 100644
index 0000000..ff0f5b2
--- /dev/null
+++ b/libcutl/tests/compiler/sloc-counter/test.cxx
@@ -0,0 +1,34 @@
+// C++ comment
+  // C++ comment
+
+/* C comment */
+
+/* Multiline
+   C
+   Comment
+
+
+*/
+
+#include <iostream>
+
+char str[] = "multi\
+line\
+string\
+literal";
+
+using namespace std;
+
+
+int main(
+  int argc /*count*/,
+  char* argv[] /*array*/)
+{
+  /* comment start */ int x = 0;
+  char* s = 
+  /* comment start */"foo";
+  int y = 2
+  /* tricky stuff *//
+  2;
+  cerr << "Hello, \"world!" << '\'' << endl;
+}
diff --git a/libcutl/tests/compiler/sloc-counter/test.std b/libcutl/tests/compiler/sloc-counter/test.std
new file mode 100644
index 0000000..00b9c31
--- /dev/null
+++ b/libcutl/tests/compiler/sloc-counter/test.std
@@ -0,0 +1,36 @@
+// C++ comment
+  // C++ comment
+
+/* C comment */
+
+/* Multiline
+   C
+   Comment
+
+
+*/
+
+#include <iostream>
+
+char str[] = "multi\
+line\
+string\
+literal";
+
+using namespace std;
+
+
+int main(
+  int argc /*count*/,
+  char* argv[] /*array*/)
+{
+  /* comment start */ int x = 0;
+  char* s = 
+  /* comment start */"foo";
+  int y = 2
+  /* tricky stuff *//
+  2;
+  cerr << "Hello, \"world!" << '\'' << endl;
+}
+
+18