summaryrefslogtreecommitdiffstats
path: root/source/slang/slang.cpp
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2019-05-31 17:20:37 -0400
committerGitHub <noreply@github.com>2019-05-31 17:20:37 -0400
commit6cbc3929a54d37bd23cb5efa8e3320ba02f78b2f (patch)
tree5a23cb47782e9e2a77762c90dd35da1005eba8d0 /source/slang/slang.cpp
parentb81ff3ef968d1cc4e954b31a1812b3c391d17b02 (diff)
Use slang- prefix on slang compiler and core source (#973)
* Prefixing source files in source/slang with slang- * Prefix source in source/slang with slang- prefix. * Rename core source files with slang- prefix. * Update project files. * Fix problems from automatic merge.
Diffstat (limited to 'source/slang/slang.cpp')
-rw-r--r--source/slang/slang.cpp37
1 files changed, 19 insertions, 18 deletions
diff --git a/source/slang/slang.cpp b/source/slang/slang.cpp
index c78a27f54..a3875ef62 100644
--- a/source/slang/slang.cpp
+++ b/source/slang/slang.cpp
@@ -4,20 +4,21 @@
#include "../core/slang-string-util.h"
#include "../core/slang-shared-library.h"
-#include "parameter-binding.h"
-#include "lower-to-ir.h"
-#include "../slang/parser.h"
-#include "../slang/preprocessor.h"
-#include "../slang/reflection.h"
-#include "syntax-visitors.h"
-#include "../slang/type-layout.h"
+#include "slang-parameter-binding.h"
+#include "slang-lower-to-ir.h"
+#include "slang-parser.h"
+#include "slang-preprocessor.h"
+#include "slang-reflection.h"
+#include "slang-syntax-visitors.h"
+#include "slang-type-layout.h"
#include "slang-file-system.h"
+
#include "../core/slang-writer.h"
-#include "source-loc.h"
+#include "slang-source-loc.h"
-#include "ir-serialize.h"
+#include "slang-ir-serialize.h"
// Used to print exception type names in internal-compiler-error messages
#include <typeinfo>
@@ -47,15 +48,15 @@ Session::Session()
#define SYNTAX_CLASS(NAME, BASE) \
mapNameToSyntaxClass.Add(getNamePool()->getName(#NAME), getClass<NAME>());
-#include "object-meta-begin.h"
-#include "syntax-base-defs.h"
-#include "expr-defs.h"
-#include "decl-defs.h"
-#include "modifier-defs.h"
-#include "stmt-defs.h"
-#include "type-defs.h"
-#include "val-defs.h"
-#include "object-meta-end.h"
+#include "slang-object-meta-begin.h"
+#include "slang-syntax-base-defs.h"
+#include "slang-expr-defs.h"
+#include "slang-decl-defs.h"
+#include "slang-modifier-defs.h"
+#include "slang-stmt-defs.h"
+#include "slang-type-defs.h"
+#include "slang-val-defs.h"
+#include "slang-object-meta-end.h"
// Make sure our source manager is initialized
builtinSourceManager.initialize(nullptr, nullptr);