Add SourceFile.H

7 files changed, 64 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 00fb2c68..0564199a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-22  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* include/SourceFile.H: New.
+
 2013-06-21  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* include/FileMapping.H: New.
diff --git a/src/Makefile.am b/src/Makefile.am
index c7cc8bfa..9f1f04c5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,7 @@ oa_src_include_headers = \
 	iterator.H \
 	storage.H \
 	FileMapping.H \
+	SourceFile.H \
 	Input.H    \
 	diagnostics.H \
 	dialect.H \
diff --git a/src/Makefile.in b/src/Makefile.in
index 8fa23c6f..9e37cafb 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -398,6 +398,7 @@ oa_src_include_headers = \
 	iterator.H \
 	storage.H \
 	FileMapping.H \
+	SourceFile.H \
 	Input.H    \
 	diagnostics.H \
 	dialect.H \
diff --git a/src/include/Input.H b/src/include/Input.H
index 8da6a833..fa4555b8 100644
--- a/src/include/Input.H
+++ b/src/include/Input.H
@@ -102,14 +102,6 @@ namespace OpenAxiom {
          iterator end() const { return { this, size() }; }
          Line line(LineNumber, const Text&);
       };
-
-      // -- Span --
-      struct Span : structure::binary<Ordinal, Cardinal> {
-         constexpr Span(Ordinal c, Cardinal l)
-               : structure::binary<Ordinal>(c, l) { }
-         constexpr Ordinal column() const { return first(); }
-         constexpr Cardinal size() const { return second(); }
-      };
    }
 }
 
diff --git a/src/include/SourceFile.H b/src/include/SourceFile.H
new file mode 100644
index 00000000..41b085a3
--- /dev/null
+++ b/src/include/SourceFile.H
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+// Copyright (C) 2013, Gabriel Dos Reis.
+// All rights reserved.
+// Written by Gabriel Dos Reis.
+//
+// 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 OpenAxiom, 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_SOURCEFILE_included
+#define OPENAXIOM_SOURCEFILE_included
+
+#include <open-axiom/FileMapping>
+
+namespace OpenAxiom {
+   namespace Input {
+      // -- SourceFile --
+      struct SourceFile : Memory::FileMapping {
+         explicit SourceFile(const std::string&);
+         const std::string& pathname() const { return path; }
+      private:
+         std::string path;
+         SourceFile(const SourceFile&) = delete;
+         SourceFile& operator=(const SourceFile&) = delete;
+      }
+   }
+}
+
+#endif  // OPENAXIOM_SOURCEFILE_included
diff --git a/src/include/dialect.H b/src/include/dialect.H
index a471981d..f63eac04 100644
--- a/src/include/dialect.H
+++ b/src/include/dialect.H
@@ -34,8 +34,9 @@
 #define OPENAXIOM_DIALECT_included
 
 namespace OpenAxiom {
+   // Languages for which we have parsers.
    enum class Language {
-      Spad, Boot
+      Spad, Boot, Lisp
    };
 }
 
diff --git a/src/utils/sexpr.H b/src/utils/sexpr.H
index 358dd506..d9ba3b33 100644
--- a/src/utils/sexpr.H
+++ b/src/utils/sexpr.H
@@ -396,14 +396,9 @@ namespace OpenAxiom {
          typedef std::set<T, SyntaxComparator> base;
          typedef typename base::const_iterator const_iterator;
 
-         template<typename U>
-         const T* allocate(const U& u) {
-            return &*this->insert(T(u)).first;
-         }
-         
-         template<typename U, typename V>
-         const T* allocate(const U& u, const V& v) {
-            return &*this->insert(T(u, v)).first;
+         template<typename... Args>
+         const T* allocate(const Args&... args) {
+            return &*this->insert(T(args...)).first;
          }
       };