aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in4
-rw-r--r--src/algebra/Makefile.in4
-rw-r--r--src/boot/Makefile.in4
-rw-r--r--src/hyper/hthits.c2
-rw-r--r--src/include/open-axiom/SyntaxTree80
-rw-r--r--src/include/open-axiom/token11
-rw-r--r--src/rt/Makefile.in4
-rw-r--r--src/utils/Makefile.in4
8 files changed, 102 insertions, 11 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 1ac3530b..935d5ce8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in
index 59191ac7..421601b2 100644
--- a/src/algebra/Makefile.in
+++ b/src/algebra/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in
index 885b9636..c1922df0 100644
--- a/src/boot/Makefile.in
+++ b/src/boot/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/src/hyper/hthits.c b/src/hyper/hthits.c
index 8b2c3c10..470bf297 100644
--- a/src/hyper/hthits.c
+++ b/src/hyper/hthits.c
@@ -96,7 +96,7 @@ badDB()
static void
-untexbuf(register char* s)
+untexbuf(char* s)
{
char *d = s;
diff --git a/src/include/open-axiom/SyntaxTree b/src/include/open-axiom/SyntaxTree
new file mode 100644
index 00000000..7eb48ac8
--- /dev/null
+++ b/src/include/open-axiom/SyntaxTree
@@ -0,0 +1,80 @@
+// -*- C++ -*-
+// Copyright (C) 2017, 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_SYNTAX_TREE_included
+#define OPENAXIOM_SYNTAX_TREE_included
+
+#include <stdint.h>
+#include <open-axiom/token>
+
+namespace OpenAxiom {
+ enum class SyntaxKind : uint8_t {
+ Module, Namespce, Import, Definition, Unparsed
+ };
+
+ enum SyntaxTree : uint32_t { };
+
+ constexpr SyntaxKind kind(SyntaxTree t) {
+ return SyntaxKind((uint32_t(t) & 0xFF000000) >> 24);
+ }
+
+ constexpr uint32_t index(SyntaxTree t) {
+ return uint32_t(t) & 0x00FFFFFF;
+ }
+
+ struct ModuleSyntax {
+ TokenIndex keyword;
+ TokenIndex name;
+ };
+
+ struct NamespaceSyntax {
+ TokenIndex keyword;
+ TokenIndex name;
+ };
+
+ struct ImportSyntax {
+ TokenIndex keyword;
+ };
+
+ struct DefinitionSyntax {
+ TokenIndex keyword;
+ };
+
+ struct UnparsedSyntax {
+ TokenIndex first;
+ TokenIndex last;
+ };
+}
+
+#endif // OPENAXIOM_SYNTAX_TREE_included
+
diff --git a/src/include/open-axiom/token b/src/include/open-axiom/token
index 943d01cc..1d17f5de 100644
--- a/src/include/open-axiom/token
+++ b/src/include/open-axiom/token
@@ -72,6 +72,17 @@ namespace OpenAxiom {
std::ostream& operator<<(std::ostream&, TokenValue);
+
+ enum class TokenIndex : uint32_t { };
+
+ constexpr TokenValue value(TokenIndex t) {
+ return TokenValue((uint32_t(t) & 0xFF000000) >> 24);
+ }
+
+ constexpr uint32_t index(TokenIndex t) {
+ return uint32_t(t) & 0x00FFFFFF;
+ }
+
// Program text region, with a fragment.
struct Region {
FragmentCursor start;
diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in
index 3a4cce43..7b829ab8 100644
--- a/src/rt/Makefile.in
+++ b/src/rt/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 5f977ae5..dcd4070f 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,