summaryrefslogtreecommitdiff
path: root/src/ast/npc.hpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-10-29 14:56:55 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-10-29 14:56:55 -0700
commit1a00fe4ea75924bfe594c4d92073cc95eaa2f32d (patch)
treea6e8992e0821a998236a4dfb5d6f6194a0b7ce97 /src/ast/npc.hpp
parent469991120bcf550b6e2124203103876b6b7be918 (diff)
downloadtmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.tar.gz
tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.tar.bz2
tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.tar.xz
tmwa-1a00fe4ea75924bfe594c4d92073cc95eaa2f32d.zip
Item AST
Diffstat (limited to 'src/ast/npc.hpp')
-rw-r--r--src/ast/npc.hpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/ast/npc.hpp b/src/ast/npc.hpp
index 648b40b..dd323b6 100644
--- a/src/ast/npc.hpp
+++ b/src/ast/npc.hpp
@@ -24,6 +24,8 @@
#include "../compat/result.hpp"
+#include "../io/span.hpp"
+
#include "../mmo/clif.t.hpp"
#include "../mmo/ids.hpp"
#include "../mmo/strs.hpp"
@@ -35,9 +37,9 @@
namespace tmwa
{
-namespace npc
+namespace ast
{
-namespace parse
+namespace npc
{
using io::Spanned;
@@ -100,7 +102,7 @@ namespace parse
{
io::LineSpan key_span;
// see src/script/parser.hpp
- script::parse::ScriptBody body;
+ ast::script::ScriptBody body;
};
struct ScriptFunction : Script
{
@@ -133,6 +135,6 @@ namespace parse
// other Script subclasses elsewhere? (for item and magic scripts)
Result<std::unique_ptr<TopLevel>> parse_top(io::LineCharReader& in);
-} // namespace parse
} // namespace npc
+} // namespace ast
} // namespace tmwa