Arrange the source include director to mirror expected build structure instead of creating links.

3 files changed, 1 insertions, 172 deletions

diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 18806e1d..cde398ed 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -220,8 +220,7 @@ am__define_uniq_tagged_files = \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/hash-table.H \
-	$(srcdir)/string-pool.H $(top_srcdir)/config/depcomp \
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \
 	$(top_srcdir)/config/mkinstalldirs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
diff --git a/src/utils/hash-table.H b/src/utils/hash-table.H
deleted file mode 100644
index d74c7760..00000000
--- a/src/utils/hash-table.H
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (C) 2010, Gabriel Dos Reis.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     - Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//
-//     - Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in
-//       the documentation and/or other materials provided with the
-//       distribution.
-//
-//     - Neither the name of The Numerical Algorithms Group Ltd. nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef OPENAXIOM_HASH_TABLE_INCLUDED
-#define OPENAXIOM_HASH_TABLE_INCLUDED
-
-// --% Author: Gabriel Dos Reis.
-// --% Description:
-// --%   Simple hash table facility.  To be replaced by C++0x
-// --%   hash tables when C++0x compilers become common place.
-
-#include <open-axiom/storage>
-
-namespace OpenAxiom {
-   // --------------------
-   // -- HashTableEntry --
-   // --------------------
-   // Datatype for entries in a parameterized hash table.
-   // The type parameter is required to be a value-construcitble datatype.
-   // A table bucket entry is required to be at least 8-byte aligned
-   // so that an instance of it can be used directly as a VM value.
-   // See <open-axiom/vm> for more description.
-   template<typename T>
-   struct alignas(8) HashTableEntry : T {
-      HashTableEntry* chain;   // previous item in the same bucket chain
-      size_t hash;             // hash code of stored data
-   };
-
-   // --------------------
-   // -- BasicHashTable --
-   // --------------------
-   // A simple hash table data structure.  Ideally, we would like to use
-   // standard C++ types, but hash tables were only in a C++ 2003 TR,
-   // officially part of C++0x standard library.  We still don't have
-   // wide-spread C++0x compilers.
-   template<typename T>
-   struct BasicHashTable : private Memory::Arena<HashTableEntry<T> > {
-      typedef HashTableEntry<T> EntryType;
-      explicit BasicHashTable(size_t n)
-            : Memory::Arena<HashTableEntry<T> >(n),
-              buckets(this->allocate(n)), nbuckets(n) { }
-
-      EntryType* hash_chain(size_t h) const {
-         return buckets + (h % nbuckets);
-      }
-
-      EntryType* new_bucket() {
-         return this->allocate(1);
-      }
-
-   private:
-      HashTableEntry<T>* const buckets;
-      const size_t nbuckets;
-   };
-}
-
-#endif  // OPENAXIOM_HASH_TABLE_INCLUDED
diff --git a/src/utils/string-pool.H b/src/utils/string-pool.H
deleted file mode 100644
index 1f746e6d..00000000
--- a/src/utils/string-pool.H
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (C) 2010-2015, Gabriel Dos Reis.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     - Redistributions of source code must retain the above copyright
-//       notice, this list of conditions and the following disclaimer.
-//
-//     - Redistributions in binary form must reproduce the above copyright
-//       notice, this list of conditions and the following disclaimer in
-//       the documentation and/or other materials provided with the
-//       distribution.
-//
-//     - Neither the name of The Numerical Algorithms Group Ltd. nor the
-//       names of its contributors may be used to endorse or promote products
-//       derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-// OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef OPENAXIOM_STRING_POOL_INCLUDED
-#define OPENAXIOM_STRING_POOL_INCLUDED
-
-#include <open-axiom/hash-table>
-
-// --% Author: Gabriel Dos Reis.
-// --% Description:
-// --%   Basic persistent string facility.
-// --%   A stringpool for allocating long-living string objects.
-
-namespace OpenAxiom {
-   struct StringPool;
-
-   // ----------------
-   // -- StringItem --
-   // ----------------
-   // String data allocated from a stringpool.
-   struct StringItem {
-      const Byte* begin() const { return text; }
-      const Byte* end() const { return text + length; }
-      size_t size() const { return length; }
-      bool equal(const Byte*, size_t) const;
-   protected:
-      const Byte* text;         // pointer to the byte sequence
-      size_t length;            // number of bytes in this string
-      friend StringPool;
-      StringItem() : text(), length() { }
-   };
-
-   // ----------------
-   // -- StringPool --
-   // ----------------
-   // A string-pool object is a repository of long-living string objects.
-   // It contains no duplicates, therefore allows  fast equality 
-   // comparison of string objects.
-   struct StringPool : private BasicHashTable<StringItem> {
-      using BasicHashTable<StringItem>::EntryType;
-
-      StringPool();
-      // Intern a NUL-terminated sequence of characters.
-      EntryType* intern(const char*);
-
-      // Intern a sequence of characters given by its start and length.
-      EntryType* intern(const Byte*, size_t);
-   private:
-      Memory::Arena<Byte> strings; // character blub
-      // Allocate a string from the internal arena.
-      const Byte* make_copy(const Byte*, size_t);
-   };
-
-   typedef const StringPool::EntryType* InternedString;
-}
-
-#endif  // OPENAXIOM_STRING_POOL_INCLUDED