summaryrefslogtreecommitdiffstats
path: root/tools/slang-test
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 /tools/slang-test
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 'tools/slang-test')
-rw-r--r--tools/slang-test/options.h4
-rw-r--r--tools/slang-test/slang-test-main.cpp2
-rw-r--r--tools/slang-test/slangc-tool.cpp2
-rw-r--r--tools/slang-test/test-context.h4
-rw-r--r--tools/slang-test/test-reporter.h4
-rw-r--r--tools/slang-test/unit-test-byte-encode.cpp2
-rw-r--r--tools/slang-test/unit-test-free-list.cpp2
-rw-r--r--tools/slang-test/unit-test-memory-arena.cpp2
8 files changed, 11 insertions, 11 deletions
diff --git a/tools/slang-test/options.h b/tools/slang-test/options.h
index 48c06463c..c78952625 100644
--- a/tools/slang-test/options.h
+++ b/tools/slang-test/options.h
@@ -3,11 +3,11 @@
#ifndef OPTIONS_H_INCLUDED
#define OPTIONS_H_INCLUDED
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-dictionary.h"
#include "test-reporter.h"
#include "../../source/core/slang-render-api-util.h"
-#include "../../source/core/smart-pointer.h"
+#include "../../source/core/slang-smart-pointer.h"
// A category that a test can be tagged with
struct TestCategory: public Slang::RefObject
diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp
index b7de3082f..f030dc8aa 100644
--- a/tools/slang-test/slang-test-main.cpp
+++ b/tools/slang-test/slang-test-main.cpp
@@ -1,7 +1,7 @@
// slang-test-main.cpp
#include "../../source/core/slang-io.h"
-#include "../../source/core/token-reader.h"
+#include "../../source/core/slang-token-reader.h"
#include "../../source/core/slang-std-writers.h"
#include "../../slang-com-helper.h"
diff --git a/tools/slang-test/slangc-tool.cpp b/tools/slang-test/slangc-tool.cpp
index 40fdf05dd..2a30b10e9 100644
--- a/tools/slang-test/slangc-tool.cpp
+++ b/tools/slang-test/slangc-tool.cpp
@@ -1,7 +1,7 @@
// test-context.cpp
#include "slangc-tool.h"
-#include "../../source/core/exception.h"
+#include "../../source/core/slang-exception.h"
using namespace Slang;
diff --git a/tools/slang-test/test-context.h b/tools/slang-test/test-context.h
index 95b46fe6e..afc5bb427 100644
--- a/tools/slang-test/test-context.h
+++ b/tools/slang-test/test-context.h
@@ -4,9 +4,9 @@
#define TEST_CONTEXT_H_INCLUDED
#include "../../source/core/slang-string-util.h"
-#include "../../source/core/platform.h"
+#include "../../source/core/slang-platform.h"
#include "../../source/core/slang-std-writers.h"
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-dictionary.h"
#include "../../source/core/slang-test-tool-util.h"
#include "../../source/core/slang-render-api-util.h"
diff --git a/tools/slang-test/test-reporter.h b/tools/slang-test/test-reporter.h
index 38e0d2cc3..95f9950e8 100644
--- a/tools/slang-test/test-reporter.h
+++ b/tools/slang-test/test-reporter.h
@@ -4,9 +4,9 @@
#define TEST_REPORTER_H_INCLUDED
#include "../../source/core/slang-string-util.h"
-#include "../../source/core/platform.h"
+#include "../../source/core/slang-platform.h"
#include "../../source/core/slang-std-writers.h"
-#include "../../source/core/dictionary.h"
+#include "../../source/core/slang-dictionary.h"
#define SLANG_CHECK(x) TestReporter::get()->addResultWithLocation((x), #x, __FILE__, __LINE__);
diff --git a/tools/slang-test/unit-test-byte-encode.cpp b/tools/slang-test/unit-test-byte-encode.cpp
index 83b20d4e0..8ffac3ee3 100644
--- a/tools/slang-test/unit-test-byte-encode.cpp
+++ b/tools/slang-test/unit-test-byte-encode.cpp
@@ -8,7 +8,7 @@
#include "test-context.h"
#include "../../source/core/slang-random-generator.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
using namespace Slang;
diff --git a/tools/slang-test/unit-test-free-list.cpp b/tools/slang-test/unit-test-free-list.cpp
index fd7b4844f..28973d9e5 100644
--- a/tools/slang-test/unit-test-free-list.cpp
+++ b/tools/slang-test/unit-test-free-list.cpp
@@ -8,7 +8,7 @@
#include "test-context.h"
#include "../../source/core/slang-random-generator.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
using namespace Slang;
diff --git a/tools/slang-test/unit-test-memory-arena.cpp b/tools/slang-test/unit-test-memory-arena.cpp
index 5aa0262e5..2aa898c9d 100644
--- a/tools/slang-test/unit-test-memory-arena.cpp
+++ b/tools/slang-test/unit-test-memory-arena.cpp
@@ -8,7 +8,7 @@
#include "test-context.h"
#include "../../source/core/slang-random-generator.h"
-#include "../../source/core/list.h"
+#include "../../source/core/slang-list.h"
using namespace Slang;