Merge branch 'feature/upstream' into develop

2 files changed, 0 insertions, 152 deletions

diff --git a/libcutl/tests/re/driver.cxx b/libcutl/tests/re/driver.cxx
deleted file mode 100644
index 4b070dd..0000000
--- a/libcutl/tests/re/driver.cxx
+++ /dev/null
@@ -1,83 +0,0 @@
-// file      : tests/re/driver.cxx
-// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
-// license   : MIT; see accompanying LICENSE file
-
-#include <string>
-#include <cassert>
-#include <iostream>
-
-#include <cutl/re.hxx>
-
-using namespace cutl::re;
-
-int
-main ()
-{
-  // empty() and str().
-  //
-  {
-    regex r;
-    assert (r.empty ());
-    r = "['`]foo([^ ]*)bar['`]";
-    assert (!r.empty ());
-    assert (r.str () == "['`]foo([^ ]*)bar['`]");
-  }
-
-  // Error handling.
-  //
-  try
-  {
-    regex r ("['`]foo([^ ]*bar['`]");
-    assert (false);
-  }
-  catch (format const& e)
-  {
-    assert (e.regex () == "['`]foo([^ ]*bar['`]");
-    assert (!e.description ().empty ());
-    //std::cerr << e.description () << std::endl;
-  }
-
-  // match(), search(), and replace().
-  //
-  {
-    regex r ("['`]foo([^ ]*)bar['`]");
-
-    assert (r.match ("'foofoxbar'"));
-    assert (!r.match ("'foof xbar'"));
-
-    assert (r.search ("prefix 'foofoxbar' suffix"));
-    assert (!r.search ("prefix 'foof xbar' suffix"));
-
-    assert (r.replace ("'foofoxbar'", "\\u$1") == "Fox");
-  }
-
-  // regexsub
-  //
-  {
-    regexsub r ("/['`]foo([^ ]*)bar['`]/\\u$1/");
-
-    assert (r.replace ("'foofoxbar'") == "Fox");
-  }
-
-  // regexsub escaping
-  //
-  {
-    regexsub r ("#a\\#\\\\#a?\\\\#");
-
-    assert (r.replace ("a#\\") == "a?\\");
-  }
-
-  // regexsub error handling.
-  //
-  try
-  {
-    regexsub r ("/['`]foo([^ ]*)bar['`]#\\u$1/");
-    assert (false);
-  }
-  catch (format const& e)
-  {
-    assert (e.regex () == "/['`]foo([^ ]*)bar['`]#\\u$1/");
-    assert (!e.description ().empty ());
-    //std::cerr << e.description () << std::endl;
-  }
-}
diff --git a/libcutl/tests/re/makefile b/libcutl/tests/re/makefile
deleted file mode 100644
index 3d22640..0000000
--- a/libcutl/tests/re/makefile
+++ /dev/null
@@ -1,69 +0,0 @@
-# file      : tests/re/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)
-	$(call message,test $<,$<)
-
-
-# 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)