From 39ff916917ced33a2b2b150e9ae5941a36458f39 Mon Sep 17 00:00:00 2001 From: Liu Hao Date: Wed, 21 Nov 2018 11:49:04 +0800 Subject: [PATCH] Restructure source tree. --- Makefile.am | 137 +++++++++--------- asteria/src/{ => compiler}/parser.cpp | 12 +- asteria/src/{ => compiler}/parser.hpp | 10 +- asteria/src/{ => compiler}/parser_error.cpp | 4 +- asteria/src/{ => compiler}/parser_error.hpp | 6 +- .../src/{ => compiler}/simple_source_file.cpp | 7 +- .../src/{ => compiler}/simple_source_file.hpp | 9 +- asteria/src/{ => compiler}/token.cpp | 4 +- asteria/src/{ => compiler}/token.hpp | 8 +- asteria/src/{ => compiler}/token_stream.cpp | 4 +- asteria/src/{ => compiler}/token_stream.hpp | 8 +- asteria/src/main.cpp | 4 +- .../src/{ => runtime}/abstract_context.cpp | 2 +- .../src/{ => runtime}/abstract_context.hpp | 6 +- .../src/{ => runtime}/abstract_function.cpp | 2 +- .../src/{ => runtime}/abstract_function.hpp | 8 +- asteria/src/{ => runtime}/abstract_opaque.cpp | 2 +- asteria/src/{ => runtime}/abstract_opaque.hpp | 8 +- .../abstract_variable_callback.cpp | 2 +- .../abstract_variable_callback.hpp | 8 +- .../src/{ => runtime}/analytic_context.cpp | 4 +- .../src/{ => runtime}/analytic_context.hpp | 6 +- asteria/src/{ => runtime}/block.cpp | 4 +- asteria/src/{ => runtime}/block.hpp | 8 +- asteria/src/{ => runtime}/collector.cpp | 4 +- asteria/src/{ => runtime}/collector.hpp | 6 +- asteria/src/{ => runtime}/exception.cpp | 2 +- asteria/src/{ => runtime}/exception.hpp | 6 +- .../src/{ => runtime}/executive_context.cpp | 4 +- .../src/{ => runtime}/executive_context.hpp | 6 +- asteria/src/{ => runtime}/expression.cpp | 4 +- asteria/src/{ => runtime}/expression.hpp | 8 +- asteria/src/{ => runtime}/function_header.cpp | 2 +- asteria/src/{ => runtime}/function_header.hpp | 6 +- .../src/{ => runtime}/global_collector.cpp | 4 +- .../src/{ => runtime}/global_collector.hpp | 6 +- asteria/src/{ => runtime}/global_context.cpp | 4 +- asteria/src/{ => runtime}/global_context.hpp | 8 +- .../{ => runtime}/instantiated_function.cpp | 4 +- .../{ => runtime}/instantiated_function.hpp | 6 +- asteria/src/{ => runtime}/reference.cpp | 4 +- asteria/src/{ => runtime}/reference.hpp | 6 +- .../{ => runtime}/reference_dictionary.cpp | 2 +- .../{ => runtime}/reference_dictionary.hpp | 8 +- .../src/{ => runtime}/reference_modifier.cpp | 4 +- .../src/{ => runtime}/reference_modifier.hpp | 8 +- asteria/src/{ => runtime}/reference_root.cpp | 4 +- asteria/src/{ => runtime}/reference_root.hpp | 8 +- asteria/src/{ => runtime}/reference_stack.cpp | 2 +- asteria/src/{ => runtime}/reference_stack.hpp | 8 +- .../{ => runtime}/shared_function_wrapper.hpp | 8 +- .../{ => runtime}/shared_opaque_wrapper.hpp | 8 +- asteria/src/{ => runtime}/source_location.cpp | 2 +- asteria/src/{ => runtime}/source_location.hpp | 6 +- asteria/src/{ => runtime}/statement.cpp | 4 +- asteria/src/{ => runtime}/statement.hpp | 10 +- asteria/src/{ => runtime}/value.cpp | 4 +- asteria/src/{ => runtime}/value.hpp | 10 +- asteria/src/{ => runtime}/variable.cpp | 4 +- asteria/src/{ => runtime}/variable.hpp | 8 +- .../src/{ => runtime}/variable_hashset.cpp | 2 +- .../src/{ => runtime}/variable_hashset.hpp | 8 +- asteria/src/{ => runtime}/variadic_arguer.cpp | 4 +- asteria/src/{ => runtime}/variadic_arguer.hpp | 8 +- asteria/src/{ => runtime}/xpnode.cpp | 4 +- asteria/src/{ => runtime}/xpnode.hpp | 10 +- test/block.cpp | 10 +- test/exception.cpp | 2 +- test/executive_context.cpp | 4 +- test/expression.cpp | 10 +- test/parser.cpp | 14 +- test/reference.cpp | 2 +- test/simple_source_file.cpp | 4 +- test/token_stream.cpp | 4 +- test/value.cpp | 2 +- test/variable.cpp | 2 +- 76 files changed, 284 insertions(+), 277 deletions(-) rename asteria/src/{ => compiler}/parser.cpp (99%) rename asteria/src/{ => compiler}/parser.hpp (85%) rename asteria/src/{ => compiler}/parser_error.cpp (99%) rename asteria/src/{ => compiler}/parser_error.hpp (97%) rename asteria/src/{ => compiler}/simple_source_file.cpp (92%) rename asteria/src/{ => compiler}/simple_source_file.hpp (78%) rename asteria/src/{ => compiler}/token.cpp (99%) rename asteria/src/{ => compiler}/token.hpp (97%) rename asteria/src/{ => compiler}/token_stream.cpp (99%) rename asteria/src/{ => compiler}/token_stream.hpp (88%) rename asteria/src/{ => runtime}/abstract_context.cpp (87%) rename asteria/src/{ => runtime}/abstract_context.hpp (84%) rename asteria/src/{ => runtime}/abstract_function.cpp (86%) rename asteria/src/{ => runtime}/abstract_function.hpp (79%) rename asteria/src/{ => runtime}/abstract_opaque.cpp (85%) rename asteria/src/{ => runtime}/abstract_opaque.hpp (78%) rename asteria/src/{ => runtime}/abstract_variable_callback.cpp (87%) rename asteria/src/{ => runtime}/abstract_variable_callback.hpp (68%) rename asteria/src/{ => runtime}/analytic_context.cpp (97%) rename asteria/src/{ => runtime}/analytic_context.hpp (89%) rename asteria/src/{ => runtime}/block.cpp (98%) rename asteria/src/{ => runtime}/block.hpp (92%) rename asteria/src/{ => runtime}/collector.cpp (99%) rename asteria/src/{ => runtime}/collector.hpp (91%) rename asteria/src/{ => runtime}/exception.cpp (89%) rename asteria/src/{ => runtime}/exception.hpp (93%) rename asteria/src/{ => runtime}/executive_context.cpp (98%) rename asteria/src/{ => runtime}/executive_context.hpp (91%) rename asteria/src/{ => runtime}/expression.cpp (96%) rename asteria/src/{ => runtime}/expression.hpp (85%) rename asteria/src/{ => runtime}/function_header.cpp (94%) rename asteria/src/{ => runtime}/function_header.hpp (93%) rename asteria/src/{ => runtime}/global_collector.cpp (96%) rename asteria/src/{ => runtime}/global_collector.hpp (87%) rename asteria/src/{ => runtime}/global_context.cpp (97%) rename asteria/src/{ => runtime}/global_context.hpp (86%) rename asteria/src/{ => runtime}/instantiated_function.cpp (93%) rename asteria/src/{ => runtime}/instantiated_function.hpp (88%) rename asteria/src/{ => runtime}/reference.cpp (96%) rename asteria/src/{ => runtime}/reference.hpp (96%) rename asteria/src/{ => runtime}/reference_dictionary.cpp (99%) rename asteria/src/{ => runtime}/reference_dictionary.hpp (95%) rename asteria/src/{ => runtime}/reference_modifier.cpp (99%) rename asteria/src/{ => runtime}/reference_modifier.hpp (90%) rename asteria/src/{ => runtime}/reference_root.cpp (98%) rename asteria/src/{ => runtime}/reference_root.hpp (93%) rename asteria/src/{ => runtime}/reference_stack.cpp (95%) rename asteria/src/{ => runtime}/reference_stack.hpp (94%) rename asteria/src/{ => runtime}/shared_function_wrapper.hpp (88%) rename asteria/src/{ => runtime}/shared_opaque_wrapper.hpp (91%) rename asteria/src/{ => runtime}/source_location.cpp (90%) rename asteria/src/{ => runtime}/source_location.hpp (85%) rename asteria/src/{ => runtime}/statement.cpp (99%) rename asteria/src/{ => runtime}/statement.hpp (95%) rename asteria/src/{ => runtime}/value.cpp (99%) rename asteria/src/{ => runtime}/value.hpp (94%) rename asteria/src/{ => runtime}/variable.cpp (85%) rename asteria/src/{ => runtime}/variable.hpp (93%) rename asteria/src/{ => runtime}/variable_hashset.cpp (99%) rename asteria/src/{ => runtime}/variable_hashset.hpp (94%) rename asteria/src/{ => runtime}/variadic_arguer.cpp (96%) rename asteria/src/{ => runtime}/variadic_arguer.hpp (84%) rename asteria/src/{ => runtime}/xpnode.cpp (99%) rename asteria/src/{ => runtime}/xpnode.hpp (96%) diff --git a/Makefile.am b/Makefile.am index 3e837ec3c..2153f6df3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,75 +64,82 @@ lib_librocket_la_SOURCES = \ asteria/src/rocket/cow_string.cpp pkginclude_HEADERS = \ + asteria/src/precompiled.hpp \ asteria/src/fwd.hpp \ - asteria/src/utilities.hpp \ - asteria/src/abstract_opaque.hpp \ - asteria/src/shared_opaque_wrapper.hpp \ - asteria/src/abstract_function.hpp \ - asteria/src/shared_function_wrapper.hpp \ - asteria/src/value.hpp \ - asteria/src/reference_root.hpp \ - asteria/src/reference_modifier.hpp \ - asteria/src/reference.hpp \ - asteria/src/variable.hpp \ - asteria/src/variable_hashset.hpp \ - asteria/src/abstract_variable_callback.hpp \ - asteria/src/collector.hpp \ - asteria/src/exception.hpp \ - asteria/src/source_location.hpp \ - asteria/src/function_header.hpp \ - asteria/src/abstract_context.hpp \ - asteria/src/analytic_context.hpp \ - asteria/src/executive_context.hpp \ - asteria/src/global_context.hpp \ - asteria/src/global_collector.hpp \ - asteria/src/variadic_arguer.hpp \ - asteria/src/reference_stack.hpp \ - asteria/src/reference_dictionary.hpp \ - asteria/src/xpnode.hpp \ - asteria/src/expression.hpp \ - asteria/src/statement.hpp \ - asteria/src/block.hpp \ - asteria/src/instantiated_function.hpp \ - asteria/src/parser_error.hpp \ - asteria/src/token.hpp \ - asteria/src/token_stream.hpp \ - asteria/src/parser.hpp \ - asteria/src/simple_source_file.hpp + asteria/src/utilities.hpp + +pkginclude_runtimedir = ${pkgincludedir}/runtime +pkginclude_runtime_HEADERS = \ + asteria/src/runtime/abstract_opaque.hpp \ + asteria/src/runtime/shared_opaque_wrapper.hpp \ + asteria/src/runtime/abstract_function.hpp \ + asteria/src/runtime/shared_function_wrapper.hpp \ + asteria/src/runtime/value.hpp \ + asteria/src/runtime/reference_root.hpp \ + asteria/src/runtime/reference_modifier.hpp \ + asteria/src/runtime/reference.hpp \ + asteria/src/runtime/variable.hpp \ + asteria/src/runtime/variable_hashset.hpp \ + asteria/src/runtime/abstract_variable_callback.hpp \ + asteria/src/runtime/collector.hpp \ + asteria/src/runtime/exception.hpp \ + asteria/src/runtime/source_location.hpp \ + asteria/src/runtime/function_header.hpp \ + asteria/src/runtime/abstract_context.hpp \ + asteria/src/runtime/analytic_context.hpp \ + asteria/src/runtime/executive_context.hpp \ + asteria/src/runtime/global_context.hpp \ + asteria/src/runtime/global_collector.hpp \ + asteria/src/runtime/variadic_arguer.hpp \ + asteria/src/runtime/reference_stack.hpp \ + asteria/src/runtime/reference_dictionary.hpp \ + asteria/src/runtime/xpnode.hpp \ + asteria/src/runtime/expression.hpp \ + asteria/src/runtime/statement.hpp \ + asteria/src/runtime/block.hpp \ + asteria/src/runtime/instantiated_function.hpp + +pkginclude_compilerdir = ${pkgincludedir}/compiler +pkginclude_compiler_HEADERS = \ + asteria/src/compiler/parser_error.hpp \ + asteria/src/compiler/token.hpp \ + asteria/src/compiler/token_stream.hpp \ + asteria/src/compiler/parser.hpp \ + asteria/src/compiler/simple_source_file.hpp lib_libasteria_la_SOURCES = \ asteria/src/utilities.cpp \ - asteria/src/abstract_opaque.cpp \ - asteria/src/abstract_function.cpp \ - asteria/src/value.cpp \ - asteria/src/reference_root.cpp \ - asteria/src/reference_modifier.cpp \ - asteria/src/reference.cpp \ - asteria/src/variable.cpp \ - asteria/src/variable_hashset.cpp \ - asteria/src/abstract_variable_callback.cpp \ - asteria/src/collector.cpp \ - asteria/src/exception.cpp \ - asteria/src/source_location.cpp \ - asteria/src/function_header.cpp \ - asteria/src/abstract_context.cpp \ - asteria/src/analytic_context.cpp \ - asteria/src/executive_context.cpp \ - asteria/src/global_context.cpp \ - asteria/src/global_collector.cpp \ - asteria/src/variadic_arguer.cpp \ - asteria/src/reference_stack.cpp \ - asteria/src/reference_dictionary.cpp \ - asteria/src/xpnode.cpp \ - asteria/src/expression.cpp \ - asteria/src/statement.cpp \ - asteria/src/block.cpp \ - asteria/src/instantiated_function.cpp \ - asteria/src/parser_error.cpp \ - asteria/src/token.cpp \ - asteria/src/token_stream.cpp \ - asteria/src/parser.cpp \ - asteria/src/simple_source_file.cpp + asteria/src/runtime/abstract_opaque.cpp \ + asteria/src/runtime/abstract_function.cpp \ + asteria/src/runtime/value.cpp \ + asteria/src/runtime/reference_root.cpp \ + asteria/src/runtime/reference_modifier.cpp \ + asteria/src/runtime/reference.cpp \ + asteria/src/runtime/variable.cpp \ + asteria/src/runtime/variable_hashset.cpp \ + asteria/src/runtime/abstract_variable_callback.cpp \ + asteria/src/runtime/collector.cpp \ + asteria/src/runtime/exception.cpp \ + asteria/src/runtime/source_location.cpp \ + asteria/src/runtime/function_header.cpp \ + asteria/src/runtime/abstract_context.cpp \ + asteria/src/runtime/analytic_context.cpp \ + asteria/src/runtime/executive_context.cpp \ + asteria/src/runtime/global_context.cpp \ + asteria/src/runtime/global_collector.cpp \ + asteria/src/runtime/variadic_arguer.cpp \ + asteria/src/runtime/reference_stack.cpp \ + asteria/src/runtime/reference_dictionary.cpp \ + asteria/src/runtime/xpnode.cpp \ + asteria/src/runtime/expression.cpp \ + asteria/src/runtime/statement.cpp \ + asteria/src/runtime/block.cpp \ + asteria/src/runtime/instantiated_function.cpp \ + asteria/src/compiler/parser_error.cpp \ + asteria/src/compiler/token.cpp \ + asteria/src/compiler/token_stream.cpp \ + asteria/src/compiler/parser.cpp \ + asteria/src/compiler/simple_source_file.cpp lib_libasteria_la_LIBADD = \ lib/librocket.la diff --git a/asteria/src/parser.cpp b/asteria/src/compiler/parser.cpp similarity index 99% rename from asteria/src/parser.cpp rename to asteria/src/compiler/parser.cpp index 50fb095de..ef981fe32 100644 --- a/asteria/src/parser.cpp +++ b/asteria/src/compiler/parser.cpp @@ -1,15 +1,15 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "parser.hpp" #include "token_stream.hpp" #include "token.hpp" -#include "statement.hpp" -#include "block.hpp" -#include "xpnode.hpp" -#include "expression.hpp" -#include "utilities.hpp" +#include "../runtime/statement.hpp" +#include "../runtime/block.hpp" +#include "../runtime/xpnode.hpp" +#include "../runtime/expression.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/parser.hpp b/asteria/src/compiler/parser.hpp similarity index 85% rename from asteria/src/parser.hpp rename to asteria/src/compiler/parser.hpp index 6e6edeef8..5e28543f1 100644 --- a/asteria/src/parser.hpp +++ b/asteria/src/compiler/parser.hpp @@ -1,13 +1,13 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_PARSER_HPP_ -#define ASTERIA_PARSER_HPP_ +#ifndef ASTERIA_COMPILER_PARSER_HPP_ +#define ASTERIA_COMPILER_PARSER_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "parser_error.hpp" -#include "block.hpp" -#include "rocket/variant.hpp" +#include "../runtime/block.hpp" +#include "../rocket/variant.hpp" namespace Asteria { diff --git a/asteria/src/parser_error.cpp b/asteria/src/compiler/parser_error.cpp similarity index 99% rename from asteria/src/parser_error.cpp rename to asteria/src/compiler/parser_error.cpp index bb08de9ad..bb0899fc2 100644 --- a/asteria/src/parser_error.cpp +++ b/asteria/src/compiler/parser_error.cpp @@ -1,9 +1,9 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "parser_error.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/parser_error.hpp b/asteria/src/compiler/parser_error.hpp similarity index 97% rename from asteria/src/parser_error.hpp rename to asteria/src/compiler/parser_error.hpp index d0aa0a4a0..37de2b2fe 100644 --- a/asteria/src/parser_error.hpp +++ b/asteria/src/compiler/parser_error.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_PARSER_ERROR_HPP_ -#define ASTERIA_PARSER_ERROR_HPP_ +#ifndef ASTERIA_COMPILER_PARSER_ERROR_HPP_ +#define ASTERIA_COMPILER_PARSER_ERROR_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" namespace Asteria { diff --git a/asteria/src/simple_source_file.cpp b/asteria/src/compiler/simple_source_file.cpp similarity index 92% rename from asteria/src/simple_source_file.cpp rename to asteria/src/compiler/simple_source_file.cpp index 0e542c52d..b389ace13 100644 --- a/asteria/src/simple_source_file.cpp +++ b/asteria/src/compiler/simple_source_file.cpp @@ -1,12 +1,13 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "simple_source_file.hpp" #include "token_stream.hpp" #include "parser.hpp" -#include "function_header.hpp" -#include "utilities.hpp" +#include "../runtime/function_header.hpp" +#include "../runtime/reference.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/simple_source_file.hpp b/asteria/src/compiler/simple_source_file.hpp similarity index 78% rename from asteria/src/simple_source_file.hpp rename to asteria/src/compiler/simple_source_file.hpp index 16ab0b449..1e25243ed 100644 --- a/asteria/src/simple_source_file.hpp +++ b/asteria/src/compiler/simple_source_file.hpp @@ -1,12 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_SIMPLE_SOURCE_FILE_HPP_ -#define ASTERIA_SIMPLE_SOURCE_FILE_HPP_ +#ifndef ASTERIA_COMPILER_SIMPLE_SOURCE_FILE_HPP_ +#define ASTERIA_COMPILER_SIMPLE_SOURCE_FILE_HPP_ -#include "fwd.hpp" -#include "block.hpp" -#include "reference.hpp" +#include "../fwd.hpp" +#include "../runtime/block.hpp" namespace Asteria { diff --git a/asteria/src/token.cpp b/asteria/src/compiler/token.cpp similarity index 99% rename from asteria/src/token.cpp rename to asteria/src/compiler/token.cpp index 00d1d1970..3e83108ec 100644 --- a/asteria/src/token.cpp +++ b/asteria/src/compiler/token.cpp @@ -1,9 +1,9 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "token.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/token.hpp b/asteria/src/compiler/token.hpp similarity index 97% rename from asteria/src/token.hpp rename to asteria/src/compiler/token.hpp index 0db14a5ec..44afe7c4c 100644 --- a/asteria/src/token.hpp +++ b/asteria/src/compiler/token.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_TOKEN_HPP_ -#define ASTERIA_TOKEN_HPP_ +#ifndef ASTERIA_COMPILER_TOKEN_HPP_ +#define ASTERIA_COMPILER_TOKEN_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "parser_error.hpp" -#include "rocket/variant.hpp" +#include "../rocket/variant.hpp" namespace Asteria { diff --git a/asteria/src/token_stream.cpp b/asteria/src/compiler/token_stream.cpp similarity index 99% rename from asteria/src/token_stream.cpp rename to asteria/src/compiler/token_stream.cpp index 910ce23dd..eab1169f7 100644 --- a/asteria/src/token_stream.cpp +++ b/asteria/src/compiler/token_stream.cpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "token_stream.hpp" #include "token.hpp" #include "parser_error.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/token_stream.hpp b/asteria/src/compiler/token_stream.hpp similarity index 88% rename from asteria/src/token_stream.hpp rename to asteria/src/compiler/token_stream.hpp index 3b8683bd1..c3e1cf6b4 100644 --- a/asteria/src/token_stream.hpp +++ b/asteria/src/compiler/token_stream.hpp @@ -1,13 +1,13 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_TOKEN_STREAM_HPP_ -#define ASTERIA_TOKEN_STREAM_HPP_ +#ifndef ASTERIA_COMPILER_TOKEN_STREAM_HPP_ +#define ASTERIA_COMPILER_TOKEN_STREAM_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "parser_error.hpp" #include "token.hpp" -#include "rocket/variant.hpp" +#include "../rocket/variant.hpp" namespace Asteria { diff --git a/asteria/src/main.cpp b/asteria/src/main.cpp index 30e9e2e0e..c12b7b1bd 100644 --- a/asteria/src/main.cpp +++ b/asteria/src/main.cpp @@ -1,8 +1,8 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "simple_source_file.hpp" -#include "global_context.hpp" +#include "compiler/simple_source_file.hpp" +#include "runtime/global_context.hpp" #include #include #include diff --git a/asteria/src/abstract_context.cpp b/asteria/src/runtime/abstract_context.cpp similarity index 87% rename from asteria/src/abstract_context.cpp rename to asteria/src/runtime/abstract_context.cpp index 74c311b80..ea0dc90f1 100644 --- a/asteria/src/abstract_context.cpp +++ b/asteria/src/runtime/abstract_context.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "abstract_context.hpp" #include "reference.hpp" diff --git a/asteria/src/abstract_context.hpp b/asteria/src/runtime/abstract_context.hpp similarity index 84% rename from asteria/src/abstract_context.hpp rename to asteria/src/runtime/abstract_context.hpp index 11831bf38..937b59663 100644 --- a/asteria/src/abstract_context.hpp +++ b/asteria/src/runtime/abstract_context.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_ABSTRACT_CONTEXT_HPP_ -#define ASTERIA_ABSTRACT_CONTEXT_HPP_ +#ifndef ASTERIA_RUNTIME_ABSTRACT_CONTEXT_HPP_ +#define ASTERIA_RUNTIME_ABSTRACT_CONTEXT_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" namespace Asteria { diff --git a/asteria/src/abstract_function.cpp b/asteria/src/runtime/abstract_function.cpp similarity index 86% rename from asteria/src/abstract_function.cpp rename to asteria/src/runtime/abstract_function.cpp index c2c2723e0..f916a1b9b 100644 --- a/asteria/src/abstract_function.cpp +++ b/asteria/src/runtime/abstract_function.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "abstract_function.hpp" namespace Asteria { diff --git a/asteria/src/abstract_function.hpp b/asteria/src/runtime/abstract_function.hpp similarity index 79% rename from asteria/src/abstract_function.hpp rename to asteria/src/runtime/abstract_function.hpp index b23d08843..f3e992b03 100644 --- a/asteria/src/abstract_function.hpp +++ b/asteria/src/runtime/abstract_function.hpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_ABSTRACT_FUNCTION_HPP_ -#define ASTERIA_ABSTRACT_FUNCTION_HPP_ +#ifndef ASTERIA_RUNTIME_ABSTRACT_FUNCTION_HPP_ +#define ASTERIA_RUNTIME_ABSTRACT_FUNCTION_HPP_ -#include "fwd.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../fwd.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/abstract_opaque.cpp b/asteria/src/runtime/abstract_opaque.cpp similarity index 85% rename from asteria/src/abstract_opaque.cpp rename to asteria/src/runtime/abstract_opaque.cpp index 3bed27962..2b6741616 100644 --- a/asteria/src/abstract_opaque.cpp +++ b/asteria/src/runtime/abstract_opaque.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "abstract_opaque.hpp" namespace Asteria { diff --git a/asteria/src/abstract_opaque.hpp b/asteria/src/runtime/abstract_opaque.hpp similarity index 78% rename from asteria/src/abstract_opaque.hpp rename to asteria/src/runtime/abstract_opaque.hpp index abb6773ce..447811857 100644 --- a/asteria/src/abstract_opaque.hpp +++ b/asteria/src/runtime/abstract_opaque.hpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_ABSTRACT_OPAQUE_HPP_ -#define ASTERIA_ABSTRACT_OPAQUE_HPP_ +#ifndef ASTERIA_RUNTIME_ABSTRACT_OPAQUE_HPP_ +#define ASTERIA_RUNTIME_ABSTRACT_OPAQUE_HPP_ -#include "fwd.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../fwd.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/abstract_variable_callback.cpp b/asteria/src/runtime/abstract_variable_callback.cpp similarity index 87% rename from asteria/src/abstract_variable_callback.cpp rename to asteria/src/runtime/abstract_variable_callback.cpp index 282c12a1d..0bcf0e7bc 100644 --- a/asteria/src/abstract_variable_callback.cpp +++ b/asteria/src/runtime/abstract_variable_callback.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "abstract_variable_callback.hpp" namespace Asteria { diff --git a/asteria/src/abstract_variable_callback.hpp b/asteria/src/runtime/abstract_variable_callback.hpp similarity index 68% rename from asteria/src/abstract_variable_callback.hpp rename to asteria/src/runtime/abstract_variable_callback.hpp index d6ac5e7a8..373d949dd 100644 --- a/asteria/src/abstract_variable_callback.hpp +++ b/asteria/src/runtime/abstract_variable_callback.hpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_ABSTRACT_VARIABLE_CALLBACK_HPP_ -#define ASTERIA_ABSTRACT_VARIABLE_CALLBACK_HPP_ +#ifndef ASTERIA_RUNTIME_ABSTRACT_VARIABLE_CALLBACK_HPP_ +#define ASTERIA_RUNTIME_ABSTRACT_VARIABLE_CALLBACK_HPP_ -#include "fwd.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../fwd.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/analytic_context.cpp b/asteria/src/runtime/analytic_context.cpp similarity index 97% rename from asteria/src/analytic_context.cpp rename to asteria/src/runtime/analytic_context.cpp index 639d9d3c1..ed2d0ec0f 100644 --- a/asteria/src/analytic_context.cpp +++ b/asteria/src/runtime/analytic_context.cpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "analytic_context.hpp" #include "function_header.hpp" #include "reference.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/analytic_context.hpp b/asteria/src/runtime/analytic_context.hpp similarity index 89% rename from asteria/src/analytic_context.hpp rename to asteria/src/runtime/analytic_context.hpp index c9c9a08a8..db7d77cb3 100644 --- a/asteria/src/analytic_context.hpp +++ b/asteria/src/runtime/analytic_context.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_ANALYTIC_CONTEXT_HPP_ -#define ASTERIA_ANALYTIC_CONTEXT_HPP_ +#ifndef ASTERIA_RUNTIME_ANALYTIC_CONTEXT_HPP_ +#define ASTERIA_RUNTIME_ANALYTIC_CONTEXT_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_context.hpp" #include "reference_dictionary.hpp" diff --git a/asteria/src/block.cpp b/asteria/src/runtime/block.cpp similarity index 98% rename from asteria/src/block.cpp rename to asteria/src/runtime/block.cpp index 51a0c86a9..5ca647227 100644 --- a/asteria/src/block.cpp +++ b/asteria/src/runtime/block.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "block.hpp" #include "xpnode.hpp" #include "statement.hpp" @@ -9,7 +9,7 @@ #include "analytic_context.hpp" #include "executive_context.hpp" #include "instantiated_function.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/block.hpp b/asteria/src/runtime/block.hpp similarity index 92% rename from asteria/src/block.hpp rename to asteria/src/runtime/block.hpp index 2e999cb2d..6065ce82d 100644 --- a/asteria/src/block.hpp +++ b/asteria/src/runtime/block.hpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_BLOCK_HPP_ -#define ASTERIA_BLOCK_HPP_ +#ifndef ASTERIA_RUNTIME_BLOCK_HPP_ +#define ASTERIA_RUNTIME_BLOCK_HPP_ -#include "fwd.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../fwd.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/collector.cpp b/asteria/src/runtime/collector.cpp similarity index 99% rename from asteria/src/collector.cpp rename to asteria/src/runtime/collector.cpp index 4f8e706d7..308f8f58f 100644 --- a/asteria/src/collector.cpp +++ b/asteria/src/runtime/collector.cpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "collector.hpp" #include "variable.hpp" #include "abstract_variable_callback.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/collector.hpp b/asteria/src/runtime/collector.hpp similarity index 91% rename from asteria/src/collector.hpp rename to asteria/src/runtime/collector.hpp index d67ef3991..41be302e2 100644 --- a/asteria/src/collector.hpp +++ b/asteria/src/runtime/collector.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_COLLECTOR_HPP_ -#define ASTERIA_COLLECTOR_HPP_ +#ifndef ASTERIA_RUNTIME_COLLECTOR_HPP_ +#define ASTERIA_RUNTIME_COLLECTOR_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "variable_hashset.hpp" namespace Asteria { diff --git a/asteria/src/exception.cpp b/asteria/src/runtime/exception.cpp similarity index 89% rename from asteria/src/exception.cpp rename to asteria/src/runtime/exception.cpp index 21a8e84a9..ce0160527 100644 --- a/asteria/src/exception.cpp +++ b/asteria/src/runtime/exception.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "exception.hpp" namespace Asteria { diff --git a/asteria/src/exception.hpp b/asteria/src/runtime/exception.hpp similarity index 93% rename from asteria/src/exception.hpp rename to asteria/src/runtime/exception.hpp index 693ff88ea..832229b01 100644 --- a/asteria/src/exception.hpp +++ b/asteria/src/runtime/exception.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_EXCEPTION_HPP_ -#define ASTERIA_EXCEPTION_HPP_ +#ifndef ASTERIA_RUNTIME_EXCEPTION_HPP_ +#define ASTERIA_RUNTIME_EXCEPTION_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "source_location.hpp" #include "value.hpp" #include diff --git a/asteria/src/executive_context.cpp b/asteria/src/runtime/executive_context.cpp similarity index 98% rename from asteria/src/executive_context.cpp rename to asteria/src/runtime/executive_context.cpp index 06e093c50..72266c03d 100644 --- a/asteria/src/executive_context.cpp +++ b/asteria/src/runtime/executive_context.cpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "executive_context.hpp" #include "function_header.hpp" #include "reference.hpp" #include "variadic_arguer.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/executive_context.hpp b/asteria/src/runtime/executive_context.hpp similarity index 91% rename from asteria/src/executive_context.hpp rename to asteria/src/runtime/executive_context.hpp index 40cc6e921..3e1971333 100644 --- a/asteria/src/executive_context.hpp +++ b/asteria/src/runtime/executive_context.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_EXECUTIVE_CONTEXT_HPP_ -#define ASTERIA_EXECUTIVE_CONTEXT_HPP_ +#ifndef ASTERIA_RUNTIME_EXECUTIVE_CONTEXT_HPP_ +#define ASTERIA_RUNTIME_EXECUTIVE_CONTEXT_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_context.hpp" #include "reference_dictionary.hpp" diff --git a/asteria/src/expression.cpp b/asteria/src/runtime/expression.cpp similarity index 96% rename from asteria/src/expression.cpp rename to asteria/src/runtime/expression.cpp index 76cc42368..4f5129169 100644 --- a/asteria/src/expression.cpp +++ b/asteria/src/runtime/expression.cpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "expression.hpp" #include "xpnode.hpp" #include "statement.hpp" #include "reference_stack.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/expression.hpp b/asteria/src/runtime/expression.hpp similarity index 85% rename from asteria/src/expression.hpp rename to asteria/src/runtime/expression.hpp index 8e2af56d6..055123825 100644 --- a/asteria/src/expression.hpp +++ b/asteria/src/runtime/expression.hpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_EXPRESSION_HPP_ -#define ASTERIA_EXPRESSION_HPP_ +#ifndef ASTERIA_RUNTIME_EXPRESSION_HPP_ +#define ASTERIA_RUNTIME_EXPRESSION_HPP_ -#include "fwd.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../fwd.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/function_header.cpp b/asteria/src/runtime/function_header.cpp similarity index 94% rename from asteria/src/function_header.cpp rename to asteria/src/runtime/function_header.cpp index 32019991c..25bd1b68a 100644 --- a/asteria/src/function_header.cpp +++ b/asteria/src/runtime/function_header.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "function_header.hpp" namespace Asteria { diff --git a/asteria/src/function_header.hpp b/asteria/src/runtime/function_header.hpp similarity index 93% rename from asteria/src/function_header.hpp rename to asteria/src/runtime/function_header.hpp index 4e51efeaf..ae0e9692d 100644 --- a/asteria/src/function_header.hpp +++ b/asteria/src/runtime/function_header.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_FUNCTION_HEADER_HPP_ -#define ASTERIA_FUNCTION_HEADER_HPP_ +#ifndef ASTERIA_RUNTIME_FUNCTION_HEADER_HPP_ +#define ASTERIA_RUNTIME_FUNCTION_HEADER_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "source_location.hpp" namespace Asteria { diff --git a/asteria/src/global_collector.cpp b/asteria/src/runtime/global_collector.cpp similarity index 96% rename from asteria/src/global_collector.cpp rename to asteria/src/runtime/global_collector.cpp index 243b4ab88..f2ec07f45 100644 --- a/asteria/src/global_collector.cpp +++ b/asteria/src/runtime/global_collector.cpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "global_collector.hpp" #include "variable.hpp" #include "reference.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/global_collector.hpp b/asteria/src/runtime/global_collector.hpp similarity index 87% rename from asteria/src/global_collector.hpp rename to asteria/src/runtime/global_collector.hpp index fab6e53b9..a83420782 100644 --- a/asteria/src/global_collector.hpp +++ b/asteria/src/runtime/global_collector.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_GLOBAL_COLLECTOR_HPP_ -#define ASTERIA_GLOBAL_COLLECTOR_HPP_ +#ifndef ASTERIA_RUNTIME_GLOBAL_COLLECTOR_HPP_ +#define ASTERIA_RUNTIME_GLOBAL_COLLECTOR_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "collector.hpp" namespace Asteria { diff --git a/asteria/src/global_context.cpp b/asteria/src/runtime/global_context.cpp similarity index 97% rename from asteria/src/global_context.cpp rename to asteria/src/runtime/global_context.cpp index 175675449..26ffd06ca 100644 --- a/asteria/src/global_context.cpp +++ b/asteria/src/runtime/global_context.cpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "global_context.hpp" #include "global_collector.hpp" #include "variable.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/global_context.hpp b/asteria/src/runtime/global_context.hpp similarity index 86% rename from asteria/src/global_context.hpp rename to asteria/src/runtime/global_context.hpp index e0672ed26..ab0062d25 100644 --- a/asteria/src/global_context.hpp +++ b/asteria/src/runtime/global_context.hpp @@ -1,13 +1,13 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_GLOBAL_CONTEXT_HPP_ -#define ASTERIA_GLOBAL_CONTEXT_HPP_ +#ifndef ASTERIA_RUNTIME_GLOBAL_CONTEXT_HPP_ +#define ASTERIA_RUNTIME_GLOBAL_CONTEXT_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_context.hpp" #include "reference_dictionary.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/instantiated_function.cpp b/asteria/src/runtime/instantiated_function.cpp similarity index 93% rename from asteria/src/instantiated_function.cpp rename to asteria/src/runtime/instantiated_function.cpp index 5426b5439..0b08df78e 100644 --- a/asteria/src/instantiated_function.cpp +++ b/asteria/src/runtime/instantiated_function.cpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "instantiated_function.hpp" #include "reference.hpp" #include "executive_context.hpp" #include "statement.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/instantiated_function.hpp b/asteria/src/runtime/instantiated_function.hpp similarity index 88% rename from asteria/src/instantiated_function.hpp rename to asteria/src/runtime/instantiated_function.hpp index f68c8d83b..83a4dde05 100644 --- a/asteria/src/instantiated_function.hpp +++ b/asteria/src/runtime/instantiated_function.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_INSTANTIATED_FUNCTION_HPP_ -#define ASTERIA_INSTANTIATED_FUNCTION_HPP_ +#ifndef ASTERIA_RUNTIME_INSTANTIATED_FUNCTION_HPP_ +#define ASTERIA_RUNTIME_INSTANTIATED_FUNCTION_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_function.hpp" #include "function_header.hpp" #include "variadic_arguer.hpp" diff --git a/asteria/src/reference.cpp b/asteria/src/runtime/reference.cpp similarity index 96% rename from asteria/src/reference.cpp rename to asteria/src/runtime/reference.cpp index d17dd4c8e..fd7002577 100644 --- a/asteria/src/reference.cpp +++ b/asteria/src/runtime/reference.cpp @@ -1,9 +1,9 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "reference.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/reference.hpp b/asteria/src/runtime/reference.hpp similarity index 96% rename from asteria/src/reference.hpp rename to asteria/src/runtime/reference.hpp index 0839f5aff..09875c8fd 100644 --- a/asteria/src/reference.hpp +++ b/asteria/src/runtime/reference.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_REFERENCE_HPP_ -#define ASTERIA_REFERENCE_HPP_ +#ifndef ASTERIA_RUNTIME_REFERENCE_HPP_ +#define ASTERIA_RUNTIME_REFERENCE_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "reference_root.hpp" #include "reference_modifier.hpp" diff --git a/asteria/src/reference_dictionary.cpp b/asteria/src/runtime/reference_dictionary.cpp similarity index 99% rename from asteria/src/reference_dictionary.cpp rename to asteria/src/runtime/reference_dictionary.cpp index 98475f4fd..ef062d916 100644 --- a/asteria/src/reference_dictionary.cpp +++ b/asteria/src/runtime/reference_dictionary.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "reference_dictionary.hpp" namespace Asteria { diff --git a/asteria/src/reference_dictionary.hpp b/asteria/src/runtime/reference_dictionary.hpp similarity index 95% rename from asteria/src/reference_dictionary.hpp rename to asteria/src/runtime/reference_dictionary.hpp index ba1b7a2f4..2f7248744 100644 --- a/asteria/src/reference_dictionary.hpp +++ b/asteria/src/runtime/reference_dictionary.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_REFERENCE_DICTIONARY_HPP_ -#define ASTERIA_REFERENCE_DICTIONARY_HPP_ +#ifndef ASTERIA_RUNTIME_REFERENCE_DICTIONARY_HPP_ +#define ASTERIA_RUNTIME_REFERENCE_DICTIONARY_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "reference.hpp" -#include "rocket/static_vector.hpp" +#include "../rocket/static_vector.hpp" namespace Asteria { diff --git a/asteria/src/reference_modifier.cpp b/asteria/src/runtime/reference_modifier.cpp similarity index 99% rename from asteria/src/reference_modifier.cpp rename to asteria/src/runtime/reference_modifier.cpp index e03fd49fc..89d936411 100644 --- a/asteria/src/reference_modifier.cpp +++ b/asteria/src/runtime/reference_modifier.cpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "reference_modifier.hpp" #include "value.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/reference_modifier.hpp b/asteria/src/runtime/reference_modifier.hpp similarity index 90% rename from asteria/src/reference_modifier.hpp rename to asteria/src/runtime/reference_modifier.hpp index bf8e3c562..25cfa7a26 100644 --- a/asteria/src/reference_modifier.hpp +++ b/asteria/src/runtime/reference_modifier.hpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_REFERENCE_MODIFIER_HPP_ -#define ASTERIA_REFERENCE_MODIFIER_HPP_ +#ifndef ASTERIA_RUNTIME_REFERENCE_MODIFIER_HPP_ +#define ASTERIA_RUNTIME_REFERENCE_MODIFIER_HPP_ -#include "fwd.hpp" -#include "rocket/variant.hpp" +#include "../fwd.hpp" +#include "../rocket/variant.hpp" namespace Asteria { diff --git a/asteria/src/reference_root.cpp b/asteria/src/runtime/reference_root.cpp similarity index 98% rename from asteria/src/reference_root.cpp rename to asteria/src/runtime/reference_root.cpp index be39e5892..325afb063 100644 --- a/asteria/src/reference_root.cpp +++ b/asteria/src/runtime/reference_root.cpp @@ -1,11 +1,11 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "reference_root.hpp" #include "abstract_variable_callback.hpp" #include "global_context.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/reference_root.hpp b/asteria/src/runtime/reference_root.hpp similarity index 93% rename from asteria/src/reference_root.hpp rename to asteria/src/runtime/reference_root.hpp index e195539b1..7f7c335a6 100644 --- a/asteria/src/reference_root.hpp +++ b/asteria/src/runtime/reference_root.hpp @@ -1,13 +1,13 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_REFERENCE_ROOT_HPP_ -#define ASTERIA_REFERENCE_ROOT_HPP_ +#ifndef ASTERIA_RUNTIME_REFERENCE_ROOT_HPP_ +#define ASTERIA_RUNTIME_REFERENCE_ROOT_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "value.hpp" #include "variable.hpp" -#include "rocket/variant.hpp" +#include "../rocket/variant.hpp" namespace Asteria { diff --git a/asteria/src/reference_stack.cpp b/asteria/src/runtime/reference_stack.cpp similarity index 95% rename from asteria/src/reference_stack.cpp rename to asteria/src/runtime/reference_stack.cpp index e1b77173f..f602859c1 100644 --- a/asteria/src/reference_stack.cpp +++ b/asteria/src/runtime/reference_stack.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "reference_stack.hpp" namespace Asteria { diff --git a/asteria/src/reference_stack.hpp b/asteria/src/runtime/reference_stack.hpp similarity index 94% rename from asteria/src/reference_stack.hpp rename to asteria/src/runtime/reference_stack.hpp index 255090c0d..aabc8e335 100644 --- a/asteria/src/reference_stack.hpp +++ b/asteria/src/runtime/reference_stack.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_REFERENCE_STACK_HPP_ -#define ASTERIA_REFERENCE_STACK_HPP_ +#ifndef ASTERIA_RUNTIME_REFERENCE_STACK_HPP_ +#define ASTERIA_RUNTIME_REFERENCE_STACK_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "reference.hpp" -#include "rocket/static_vector.hpp" +#include "../rocket/static_vector.hpp" namespace Asteria { diff --git a/asteria/src/shared_function_wrapper.hpp b/asteria/src/runtime/shared_function_wrapper.hpp similarity index 88% rename from asteria/src/shared_function_wrapper.hpp rename to asteria/src/runtime/shared_function_wrapper.hpp index 99e577ec7..958af749a 100644 --- a/asteria/src/shared_function_wrapper.hpp +++ b/asteria/src/runtime/shared_function_wrapper.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_SHARED_FUNCTION_WRAPPER_HPP_ -#define ASTERIA_SHARED_FUNCTION_WRAPPER_HPP_ +#ifndef ASTERIA_RUNTIME_SHARED_FUNCTION_WRAPPER_HPP_ +#define ASTERIA_RUNTIME_SHARED_FUNCTION_WRAPPER_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_function.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/refcounted_ptr.hpp" #include namespace Asteria { diff --git a/asteria/src/shared_opaque_wrapper.hpp b/asteria/src/runtime/shared_opaque_wrapper.hpp similarity index 91% rename from asteria/src/shared_opaque_wrapper.hpp rename to asteria/src/runtime/shared_opaque_wrapper.hpp index d0fbabfc8..6cdb40751 100644 --- a/asteria/src/shared_opaque_wrapper.hpp +++ b/asteria/src/runtime/shared_opaque_wrapper.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_SHARED_OPAQUE_WRAPPER_HPP_ -#define ASTERIA_SHARED_OPAQUE_WRAPPER_HPP_ +#ifndef ASTERIA_RUNTIME_SHARED_OPAQUE_WRAPPER_HPP_ +#define ASTERIA_RUNTIME_SHARED_OPAQUE_WRAPPER_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_opaque.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/refcounted_ptr.hpp" #include namespace Asteria { diff --git a/asteria/src/source_location.cpp b/asteria/src/runtime/source_location.cpp similarity index 90% rename from asteria/src/source_location.cpp rename to asteria/src/runtime/source_location.cpp index d82637a0b..27b93a868 100644 --- a/asteria/src/source_location.cpp +++ b/asteria/src/runtime/source_location.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "source_location.hpp" namespace Asteria { diff --git a/asteria/src/source_location.hpp b/asteria/src/runtime/source_location.hpp similarity index 85% rename from asteria/src/source_location.hpp rename to asteria/src/runtime/source_location.hpp index 00c5c26c3..125fedebe 100644 --- a/asteria/src/source_location.hpp +++ b/asteria/src/runtime/source_location.hpp @@ -1,10 +1,10 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_SOURCE_LOCATION_HPP_ -#define ASTERIA_SOURCE_LOCATION_HPP_ +#ifndef ASTERIA_RUNTIME_SOURCE_LOCATION_HPP_ +#define ASTERIA_RUNTIME_SOURCE_LOCATION_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" namespace Asteria { diff --git a/asteria/src/statement.cpp b/asteria/src/runtime/statement.cpp similarity index 99% rename from asteria/src/statement.cpp rename to asteria/src/runtime/statement.cpp index 2666840de..2f0456c9a 100644 --- a/asteria/src/statement.cpp +++ b/asteria/src/runtime/statement.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "statement.hpp" #include "xpnode.hpp" #include "global_context.hpp" @@ -10,7 +10,7 @@ #include "variable.hpp" #include "instantiated_function.hpp" #include "exception.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/statement.hpp b/asteria/src/runtime/statement.hpp similarity index 95% rename from asteria/src/statement.hpp rename to asteria/src/runtime/statement.hpp index 6445ccb15..5c1f57dff 100644 --- a/asteria/src/statement.hpp +++ b/asteria/src/runtime/statement.hpp @@ -1,15 +1,15 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_STATEMENT_HPP_ -#define ASTERIA_STATEMENT_HPP_ +#ifndef ASTERIA_RUNTIME_STATEMENT_HPP_ +#define ASTERIA_RUNTIME_STATEMENT_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "expression.hpp" #include "function_header.hpp" #include "block.hpp" -#include "rocket/variant.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/variant.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/value.cpp b/asteria/src/runtime/value.cpp similarity index 99% rename from asteria/src/value.cpp rename to asteria/src/runtime/value.cpp index 9cecfd6f8..d4c3daf3c 100644 --- a/asteria/src/value.cpp +++ b/asteria/src/runtime/value.cpp @@ -1,9 +1,9 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "value.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/value.hpp b/asteria/src/runtime/value.hpp similarity index 94% rename from asteria/src/value.hpp rename to asteria/src/runtime/value.hpp index e3ed802cd..7f3f0d0a2 100644 --- a/asteria/src/value.hpp +++ b/asteria/src/runtime/value.hpp @@ -1,14 +1,14 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_VALUE_HPP_ -#define ASTERIA_VALUE_HPP_ +#ifndef ASTERIA_RUNTIME_VALUE_HPP_ +#define ASTERIA_RUNTIME_VALUE_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "shared_opaque_wrapper.hpp" #include "shared_function_wrapper.hpp" -#include "rocket/variant.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/variant.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/variable.cpp b/asteria/src/runtime/variable.cpp similarity index 85% rename from asteria/src/variable.cpp rename to asteria/src/runtime/variable.cpp index f6b05f5a4..a73314472 100644 --- a/asteria/src/variable.cpp +++ b/asteria/src/runtime/variable.cpp @@ -1,9 +1,9 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "variable.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/variable.hpp b/asteria/src/runtime/variable.hpp similarity index 93% rename from asteria/src/variable.hpp rename to asteria/src/runtime/variable.hpp index 6475f0f1b..d22addfa0 100644 --- a/asteria/src/variable.hpp +++ b/asteria/src/runtime/variable.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_VARIABLE_HPP_ -#define ASTERIA_VARIABLE_HPP_ +#ifndef ASTERIA_RUNTIME_VARIABLE_HPP_ +#define ASTERIA_RUNTIME_VARIABLE_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "value.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/variable_hashset.cpp b/asteria/src/runtime/variable_hashset.cpp similarity index 99% rename from asteria/src/variable_hashset.cpp rename to asteria/src/runtime/variable_hashset.cpp index f81c408e0..e66f56a53 100644 --- a/asteria/src/variable_hashset.cpp +++ b/asteria/src/runtime/variable_hashset.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "variable_hashset.hpp" namespace Asteria { diff --git a/asteria/src/variable_hashset.hpp b/asteria/src/runtime/variable_hashset.hpp similarity index 94% rename from asteria/src/variable_hashset.hpp rename to asteria/src/runtime/variable_hashset.hpp index 9bd318b4e..5c054f909 100644 --- a/asteria/src/variable_hashset.hpp +++ b/asteria/src/runtime/variable_hashset.hpp @@ -1,12 +1,12 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_VARIABLE_HASHSET_HPP_ -#define ASTERIA_VARIABLE_HASHSET_HPP_ +#ifndef ASTERIA_RUNTIME_VARIABLE_HASHSET_HPP_ +#define ASTERIA_RUNTIME_VARIABLE_HASHSET_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "variable.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/variadic_arguer.cpp b/asteria/src/runtime/variadic_arguer.cpp similarity index 96% rename from asteria/src/variadic_arguer.cpp rename to asteria/src/runtime/variadic_arguer.cpp index 0d079a933..92aa046bb 100644 --- a/asteria/src/variadic_arguer.cpp +++ b/asteria/src/runtime/variadic_arguer.cpp @@ -1,9 +1,9 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "variadic_arguer.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/variadic_arguer.hpp b/asteria/src/runtime/variadic_arguer.hpp similarity index 84% rename from asteria/src/variadic_arguer.hpp rename to asteria/src/runtime/variadic_arguer.hpp index ad22ef848..0fcda7153 100644 --- a/asteria/src/variadic_arguer.hpp +++ b/asteria/src/runtime/variadic_arguer.hpp @@ -1,14 +1,14 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_VARIADIC_ARGUER_HPP_ -#define ASTERIA_VARIADIC_ARGUER_HPP_ +#ifndef ASTERIA_RUNTIME_VARIADIC_ARGUER_HPP_ +#define ASTERIA_RUNTIME_VARIADIC_ARGUER_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "abstract_function.hpp" #include "source_location.hpp" #include "reference.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/asteria/src/xpnode.cpp b/asteria/src/runtime/xpnode.cpp similarity index 99% rename from asteria/src/xpnode.cpp rename to asteria/src/runtime/xpnode.cpp index bd2853ddd..82c56ebbd 100644 --- a/asteria/src/xpnode.cpp +++ b/asteria/src/runtime/xpnode.cpp @@ -1,7 +1,7 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#include "precompiled.hpp" +#include "../precompiled.hpp" #include "xpnode.hpp" #include "statement.hpp" #include "reference_stack.hpp" @@ -11,7 +11,7 @@ #include "abstract_function.hpp" #include "instantiated_function.hpp" #include "exception.hpp" -#include "utilities.hpp" +#include "../utilities.hpp" namespace Asteria { diff --git a/asteria/src/xpnode.hpp b/asteria/src/runtime/xpnode.hpp similarity index 96% rename from asteria/src/xpnode.hpp rename to asteria/src/runtime/xpnode.hpp index 5b0580fb4..39d34cf99 100644 --- a/asteria/src/xpnode.hpp +++ b/asteria/src/runtime/xpnode.hpp @@ -1,17 +1,17 @@ // This file is part of Asteria. // Copyleft 2018, LH_Mouse. All wrongs reserved. -#ifndef ASTERIA_XPNODE_HPP_ -#define ASTERIA_XPNODE_HPP_ +#ifndef ASTERIA_RUNTIME_XPNODE_HPP_ +#define ASTERIA_RUNTIME_XPNODE_HPP_ -#include "fwd.hpp" +#include "../fwd.hpp" #include "value.hpp" #include "reference.hpp" #include "function_header.hpp" #include "expression.hpp" #include "block.hpp" -#include "rocket/variant.hpp" -#include "rocket/refcounted_ptr.hpp" +#include "../rocket/variant.hpp" +#include "../rocket/refcounted_ptr.hpp" namespace Asteria { diff --git a/test/block.cpp b/test/block.cpp index 41e6b0054..465e62475 100644 --- a/test/block.cpp +++ b/test/block.cpp @@ -2,11 +2,11 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/block.hpp" -#include "../asteria/src/xpnode.hpp" -#include "../asteria/src/statement.hpp" -#include "../asteria/src/global_context.hpp" -#include "../asteria/src/executive_context.hpp" +#include "../asteria/src/runtime/block.hpp" +#include "../asteria/src/runtime/xpnode.hpp" +#include "../asteria/src/runtime/statement.hpp" +#include "../asteria/src/runtime/global_context.hpp" +#include "../asteria/src/runtime/executive_context.hpp" using namespace Asteria; diff --git a/test/exception.cpp b/test/exception.cpp index b75dedcc6..611b247c8 100644 --- a/test/exception.cpp +++ b/test/exception.cpp @@ -2,7 +2,7 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/exception.hpp" +#include "../asteria/src/runtime/exception.hpp" using namespace Asteria; diff --git a/test/executive_context.cpp b/test/executive_context.cpp index e9fbc6072..ce5c9345c 100644 --- a/test/executive_context.cpp +++ b/test/executive_context.cpp @@ -2,8 +2,8 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/executive_context.hpp" -#include "../asteria/src/reference.hpp" +#include "../asteria/src/runtime/executive_context.hpp" +#include "../asteria/src/runtime/reference.hpp" using namespace Asteria; diff --git a/test/expression.cpp b/test/expression.cpp index 2e7c5a9c6..232226c72 100644 --- a/test/expression.cpp +++ b/test/expression.cpp @@ -2,11 +2,11 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/expression.hpp" -#include "../asteria/src/xpnode.hpp" -#include "../asteria/src/statement.hpp" -#include "../asteria/src/global_context.hpp" -#include "../asteria/src/executive_context.hpp" +#include "../asteria/src/runtime/expression.hpp" +#include "../asteria/src/runtime/xpnode.hpp" +#include "../asteria/src/runtime/statement.hpp" +#include "../asteria/src/runtime/global_context.hpp" +#include "../asteria/src/runtime/executive_context.hpp" using namespace Asteria; diff --git a/test/parser.cpp b/test/parser.cpp index 2046685ab..7b7121e23 100644 --- a/test/parser.cpp +++ b/test/parser.cpp @@ -2,13 +2,13 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/parser.hpp" -#include "../asteria/src/token_stream.hpp" -#include "../asteria/src/global_context.hpp" -#include "../asteria/src/executive_context.hpp" -#include "../asteria/src/reference.hpp" -#include "../asteria/src/exception.hpp" -#include "../asteria/src/function_header.hpp" +#include "../asteria/src/compiler/parser.hpp" +#include "../asteria/src/compiler/token_stream.hpp" +#include "../asteria/src/runtime/global_context.hpp" +#include "../asteria/src/runtime/executive_context.hpp" +#include "../asteria/src/runtime/reference.hpp" +#include "../asteria/src/runtime/exception.hpp" +#include "../asteria/src/runtime/function_header.hpp" #include using namespace Asteria; diff --git a/test/reference.cpp b/test/reference.cpp index 3249da7da..be8ef8768 100644 --- a/test/reference.cpp +++ b/test/reference.cpp @@ -2,7 +2,7 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/reference.hpp" +#include "../asteria/src/runtime/reference.hpp" using namespace Asteria; diff --git a/test/simple_source_file.cpp b/test/simple_source_file.cpp index e52a94ba5..1bebfe959 100644 --- a/test/simple_source_file.cpp +++ b/test/simple_source_file.cpp @@ -2,8 +2,8 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/simple_source_file.hpp" -#include "../asteria/src/global_context.hpp" +#include "../asteria/src/compiler/simple_source_file.hpp" +#include "../asteria/src/runtime/global_context.hpp" #include using namespace Asteria; diff --git a/test/token_stream.cpp b/test/token_stream.cpp index e42a1bcfa..58b1b48ae 100644 --- a/test/token_stream.cpp +++ b/test/token_stream.cpp @@ -2,8 +2,8 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/token_stream.hpp" -#include "../asteria/src/token.hpp" +#include "../asteria/src/compiler/token_stream.hpp" +#include "../asteria/src/compiler/token.hpp" #include using namespace Asteria; diff --git a/test/value.cpp b/test/value.cpp index 9255d3bd4..802506b51 100644 --- a/test/value.cpp +++ b/test/value.cpp @@ -2,7 +2,7 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/value.hpp" +#include "../asteria/src/runtime/value.hpp" #include using namespace Asteria; diff --git a/test/variable.cpp b/test/variable.cpp index 98367b87c..ee10701c1 100644 --- a/test/variable.cpp +++ b/test/variable.cpp @@ -2,7 +2,7 @@ // Copyleft 2018, LH_Mouse. All wrongs reserved. #include "_test_init.hpp" -#include "../asteria/src/variable.hpp" +#include "../asteria/src/runtime/variable.hpp" using namespace Asteria;