diff options
author | Gabriel Dos Reis <gdr@axiomatics.org> | 2017-12-27 04:38:07 -0800 |
---|---|---|
committer | Gabriel Dos Reis <gdr@axiomatics.org> | 2017-12-27 04:38:07 -0800 |
commit | 83ff2c1707b3c1e304feb2127503d9878b05fa9d (patch) | |
tree | 06cadddd637ba9474bfacc2b14c18d1ebafe0def /src/include | |
parent | d16f9a090321f1ec1e8b20f1fb30859bf93cea46 (diff) | |
download | open-axiom-83ff2c1707b3c1e304feb2127503d9878b05fa9d.tar.gz |
Remove antiquated check for alignas
C++14 required, alignas and alignof are now well supported as C++11
features.
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/open-axiom/SyntaxTree | 80 | ||||
-rw-r--r-- | src/include/open-axiom/token | 11 |
2 files changed, 91 insertions, 0 deletions
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; |